1 |
commit: bc077bf08c716c2eb276c66ee5ea4dbdb5ebe13d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 14:00:51 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 30 14:00:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc077bf0 |
7 |
|
8 |
x11-libs/fox: [QA] Fix more issues |
9 |
|
10 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
x11-libs/fox/fox-1.7.67.ebuild | 48 +++++++++++++++++++++++------------------- |
14 |
1 file changed, 26 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild |
17 |
index 9e6f057e84d..46ddd5fdb5e 100644 |
18 |
--- a/x11-libs/fox/fox-1.7.67.ebuild |
19 |
+++ b/x11-libs/fox/fox-1.7.67.ebuild |
20 |
@@ -14,18 +14,20 @@ SLOT="1.7" |
21 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
22 |
IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools" |
23 |
|
24 |
-RDEPEND="x11-libs/libXrandr |
25 |
- x11-libs/libXcursor |
26 |
+RDEPEND=" |
27 |
x11-libs/fox-wrapper |
28 |
+ x11-libs/libXcursor |
29 |
+ x11-libs/libXrandr |
30 |
bzip2? ( app-arch/bzip2 ) |
31 |
jpeg? ( virtual/jpeg ) |
32 |
opengl? ( virtual/glu virtual/opengl ) |
33 |
png? ( media-libs/libpng:0= ) |
34 |
tiff? ( media-libs/tiff:0= ) |
35 |
- truetype? ( media-libs/freetype:2 |
36 |
- x11-libs/libXft ) |
37 |
- zlib? ( sys-libs/zlib ) |
38 |
-" |
39 |
+ truetype? ( |
40 |
+ media-libs/freetype:2 |
41 |
+ x11-libs/libXft |
42 |
+ ) |
43 |
+ zlib? ( sys-libs/zlib )" |
44 |
DEPEND="${RDEPEND} |
45 |
x11-base/xorg-proto |
46 |
x11-libs/libXt" |
47 |
@@ -37,11 +39,11 @@ src_prepare() { |
48 |
default |
49 |
|
50 |
sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line." |
51 |
- sed -i -e "s:windows::" Makefile.am |
52 |
+ sed -i -e "s:windows::" Makefile.am || die |
53 |
if ! use tools; then |
54 |
local d |
55 |
for d in adie calculator pathfinder shutterbug; do |
56 |
- sed -i -e "s:${d}::" Makefile.am |
57 |
+ sed -i -e "s:${d}::" Makefile.am || die |
58 |
done |
59 |
fi |
60 |
|
61 |
@@ -56,6 +58,7 @@ src_prepare() { |
62 |
|
63 |
src_configure() { |
64 |
econf \ |
65 |
+ --disable-static \ |
66 |
--enable-$(usex debug debug release) \ |
67 |
$(use_enable bzip2 bz2lib) \ |
68 |
$(use_enable jpeg) \ |
69 |
@@ -69,7 +72,7 @@ src_configure() { |
70 |
|
71 |
src_compile() { |
72 |
emake |
73 |
- use doc && emake -C "${S}"/doc docs |
74 |
+ use doc && emake -C doc docs |
75 |
} |
76 |
|
77 |
src_install() { |
78 |
@@ -79,28 +82,29 @@ src_install() { |
79 |
artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \ |
80 |
screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots |
81 |
|
82 |
- CP="${ED}/usr/bin/ControlPanel" |
83 |
- if [[ -f ${CP} ]] ; then |
84 |
- mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \ |
85 |
+ local CP="${ED}"/usr/bin/ControlPanel |
86 |
+ if [[ -f ${CP} ]]; then |
87 |
+ mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \ |
88 |
die "Failed to install ControlPanel" |
89 |
fi |
90 |
|
91 |
- for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do |
92 |
- [[ -f $doc ]] && dodoc $doc |
93 |
- done |
94 |
+ dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING |
95 |
|
96 |
- # remove documentation if USE=-doc |
97 |
- use doc || rm -fr "${D}/usr/share/doc/${PF}/html" |
98 |
- |
99 |
- # install class reference docs if USE=doc |
100 |
if use doc; then |
101 |
+ # install class reference docs if USE=doc |
102 |
docinto html |
103 |
- dodoc -r "${S}/doc/ref" |
104 |
+ dodoc -r doc/ref |
105 |
+ else |
106 |
+ # remove documentation if USE=-doc |
107 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die |
108 |
fi |
109 |
|
110 |
# slot fox-config |
111 |
- if [[ -f ${D}/usr/bin/fox-config ]] ; then |
112 |
- mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${SLOT}-config" \ |
113 |
+ if [[ -f ${ED}/usr/bin/fox-config ]] ; then |
114 |
+ mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \ |
115 |
|| die "failed to install fox-config" |
116 |
fi |
117 |
+ |
118 |
+ # no static archives |
119 |
+ find "${D}" -name '*.la' -delete || die |
120 |
} |