| 1 |
commit: 2f4720cf2b4f3109a572b8d8e816e373141357f6 |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 28 08:29:53 2019 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 28 08:33:07 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4720cf |
| 7 |
|
| 8 |
x11-libs/fox: put tools behind use flag |
| 9 |
|
| 10 |
The earlier split packages paradigm is more maintenance burden than I'm |
| 11 |
willing to take on, and doing it this way lets us more easily unify |
| 12 |
things into one single ebuild. Besides, these are mostly example apps. |
| 13 |
|
| 14 |
Updates: https://bugs.gentoo.org/703088 |
| 15 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 16 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 17 |
|
| 18 |
profiles/package.mask | 4 +++- |
| 19 |
x11-libs/fox/fox-1.7.67.ebuild | 13 ++++++++----- |
| 20 |
x11-libs/fox/metadata.xml | 3 +++ |
| 21 |
3 files changed, 14 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 24 |
index 0e79c12ce61..5f6a0b3e068 100644 |
| 25 |
--- a/profiles/package.mask |
| 26 |
+++ b/profiles/package.mask |
| 27 |
@@ -160,7 +160,9 @@ app-editors/emacs-vcs |
| 28 |
app-benchmarks/spew |
| 29 |
|
| 30 |
# Jason A. Donenfeld <zx2c4@g.o> (2019-12-16) |
| 31 |
-# Simplify FOX packages. Nobody uses the demo apps or the "stable" branch. |
| 32 |
+# Simplify FOX packages. Adie, calculator, pathfinder, and shutterbug |
| 33 |
+# can now be found behind x11-libs/fox[tools], and reswrap is always |
| 34 |
+# installed by it. |
| 35 |
# Removal in 30 days. Bug #703088. Bug #703084. |
| 36 |
app-editors/adie |
| 37 |
dev-util/reswrap |
| 38 |
|
| 39 |
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild |
| 40 |
index 564900ecba7..aed93292abb 100644 |
| 41 |
--- a/x11-libs/fox/fox-1.7.67.ebuild |
| 42 |
+++ b/x11-libs/fox/fox-1.7.67.ebuild |
| 43 |
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" |
| 44 |
LICENSE="LGPL-2.1" |
| 45 |
SLOT="1.7" |
| 46 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 47 |
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile" |
| 48 |
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools" |
| 49 |
|
| 50 |
RDEPEND="x11-libs/libXrandr |
| 51 |
x11-libs/libXcursor |
| 52 |
@@ -37,10 +37,13 @@ src_prepare() { |
| 53 |
default |
| 54 |
|
| 55 |
sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line." |
| 56 |
- local d |
| 57 |
- for d in windows adie calculator pathfinder shutterbug; do |
| 58 |
- sed -i -e "s:${d}::" Makefile.am || die "Unable to remove $d." |
| 59 |
- done |
| 60 |
+ sed -i -e "s:windows::" Makefile.am |
| 61 |
+ if ! use tools; then |
| 62 |
+ local d |
| 63 |
+ for d in adie calculator pathfinder shutterbug; do |
| 64 |
+ sed -i -e "s:${d}::" Makefile.am |
| 65 |
+ done |
| 66 |
+ fi |
| 67 |
|
| 68 |
# Respect system CXXFLAGS |
| 69 |
sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags." |
| 70 |
|
| 71 |
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml |
| 72 |
index 915f0022706..a0084d6b4b7 100644 |
| 73 |
--- a/x11-libs/fox/metadata.xml |
| 74 |
+++ b/x11-libs/fox/metadata.xml |
| 75 |
@@ -5,4 +5,7 @@ |
| 76 |
<email>zx2c4@g.o</email> |
| 77 |
<name>Jason A. Donenfeld</name> |
| 78 |
</maintainer> |
| 79 |
+ <use> |
| 80 |
+ <flag name="tools">Install adie, calculator, shutterbug, and pathfinder apps.</flag> |
| 81 |
+ </use> |
| 82 |
</pkgmetadata> |
Archives