* [gentoo-commits] repo/gentoo:master commit in: profiles/, x11-libs/fox/
@ 2019-12-28 8:33 Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2019-12-28 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 2f4720cf2b4f3109a572b8d8e816e373141357f6
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 08:29:53 2019 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 08:33:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4720cf
x11-libs/fox: put tools behind use flag
The earlier split packages paradigm is more maintenance burden than I'm
willing to take on, and doing it this way lets us more easily unify
things into one single ebuild. Besides, these are mostly example apps.
Updates: https://bugs.gentoo.org/703088
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
profiles/package.mask | 4 +++-
x11-libs/fox/fox-1.7.67.ebuild | 13 ++++++++-----
x11-libs/fox/metadata.xml | 3 +++
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 0e79c12ce61..5f6a0b3e068 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -160,7 +160,9 @@ app-editors/emacs-vcs
app-benchmarks/spew
# Jason A. Donenfeld <zx2c4@gentoo.org> (2019-12-16)
-# Simplify FOX packages. Nobody uses the demo apps or the "stable" branch.
+# Simplify FOX packages. Adie, calculator, pathfinder, and shutterbug
+# can now be found behind x11-libs/fox[tools], and reswrap is always
+# installed by it.
# Removal in 30 days. Bug #703088. Bug #703084.
app-editors/adie
dev-util/reswrap
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
index 564900ecba7..aed93292abb 100644
--- a/x11-libs/fox/fox-1.7.67.ebuild
+++ b/x11-libs/fox/fox-1.7.67.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.7"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
RDEPEND="x11-libs/libXrandr
x11-libs/libXcursor
@@ -37,10 +37,13 @@ src_prepare() {
default
sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
- local d
- for d in windows adie calculator pathfinder shutterbug; do
- sed -i -e "s:${d}::" Makefile.am || die "Unable to remove $d."
- done
+ sed -i -e "s:windows::" Makefile.am
+ if ! use tools; then
+ local d
+ for d in adie calculator pathfinder shutterbug; do
+ sed -i -e "s:${d}::" Makefile.am
+ done
+ fi
# Respect system CXXFLAGS
sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
index 915f0022706..a0084d6b4b7 100644
--- a/x11-libs/fox/metadata.xml
+++ b/x11-libs/fox/metadata.xml
@@ -5,4 +5,7 @@
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
+ <use>
+ <flag name="tools">Install adie, calculator, shutterbug, and pathfinder apps.</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: profiles/, x11-libs/fox/
@ 2019-12-28 8:46 Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2019-12-28 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 722b1cf6a27a671d5b0706a75f8b8e112e949cf6
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 08:45:37 2019 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 08:45:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722b1cf6
x11-libs/fox: revive fox-1.6 stable branch
Things actually use it.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
profiles/package.mask | 2 -
x11-libs/fox/fox-1.6.57-r1.ebuild | 100 ++++++++++++++++++++++++++++++++++++++
x11-libs/fox/fox-1.6.57.ebuild | 41 ----------------
3 files changed, 100 insertions(+), 43 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 5f6a0b3e068..c4dfd170ad5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -167,10 +167,8 @@ app-benchmarks/spew
app-editors/adie
dev-util/reswrap
sci-calculators/calculator
-x11-libs/fox:1.6
x11-misc/pathfinder
x11-misc/shutterbug
-x11-misc/xfe
# Michał Górny <mgorny@gentoo.org> (2019-12-15)
# Live ebuild only. Not touched since 2012. Unsurprisingly,
diff --git a/x11-libs/fox/fox-1.6.57-r1.ebuild b/x11-libs/fox/fox-1.6.57-r1.ebuild
new file mode 100644
index 00000000000..9320c305298
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.57-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
+HOMEPAGE="http://www.fox-toolkit.org/"
+SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile"
+
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ bzip2? ( app-arch/bzip2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ tiff? ( media-libs/tiff:0= )
+ truetype? ( media-libs/freetype:2
+ x11-libs/libXft )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libXt"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ default
+
+ local d
+ for d in utils windows adie calculator pathfinder shutterbug; do
+ sed -i -e "s:${d}::" Makefile.am
+ done
+
+ # Respect system CXXFLAGS
+ sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
+
+ # don't strip binaries
+ sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-$(usex debug debug release) \
+ $(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib) \
+ $(use_with profile profiling)
+}
+
+src_compile() {
+ emake
+ use doc && emake -C "${S}"/doc docs
+}
+
+src_install() {
+ emake install \
+ DESTDIR="${D}" \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
+ screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
+
+ CP="${ED}/usr/bin/ControlPanel"
+ if [[ -f ${CP} ]] ; then
+ mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+ die "Failed to install ControlPanel"
+ fi
+
+ for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do
+ [[ -f $doc ]] && dodoc $doc
+ done
+
+ # remove documentation if USE=-doc
+ use doc || rm -fr "${D}/usr/share/doc/${PF}/html"
+
+ # install class reference docs if USE=doc
+ if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
+ docinto html
+ dodoc -r "${S}/doc/ref"
+ fi
+
+ # slot fox-config
+ if [[ -f ${D}/usr/bin/fox-config ]] ; then
+ mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${SLOT}-config" \
+ || die "failed to install fox-config"
+ fi
+}
diff --git a/x11-libs/fox/fox-1.6.57.ebuild b/x11-libs/fox/fox-1.6.57.ebuild
deleted file mode 100644
index 330f85c8a75..00000000000
--- a/x11-libs/fox/fox-1.6.57.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
-
-RDEPEND="x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/fox-wrapper
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- jpeg? ( virtual/jpeg:= )
- opengl? ( virtual/glu virtual/opengl )
- png? ( >=media-libs/libpng-1.2.5:0= )
- tiff? ( >=media-libs/tiff-3.5.7:0= )
- truetype? ( =media-libs/freetype-2*
- x11-libs/libXft )
- zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libXt"
-
-src_prepare() {
- sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
- fox_src_prepare
-}
-
-src_configure() {
- FOXCONF="$(use_enable bzip2 bz2lib) \
- $(use_enable jpeg) \
- $(use_with opengl) \
- $(use_enable png) \
- $(use_enable tiff) \
- $(use_with truetype xft) \
- $(use_enable zlib)" fox_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-28 8:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-28 8:46 [gentoo-commits] repo/gentoo:master commit in: profiles/, x11-libs/fox/ Jason A. Donenfeld
-- strict thread matches above, loose matches on Subject: below --
2019-12-28 8:33 Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox