Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rw/
Date: Fri, 28 Feb 2020 12:57:49
Message-Id: 1582894413.7d9d78d4154c1aa111a5316b7c4fd13bb4319fd1.mjo@gentoo
1 commit: 7d9d78d4154c1aa111a5316b7c4fd13bb4319fd1
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 28 12:51:34 2020 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 28 12:53:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9d78d4
7
8 sci-mathematics/rw: new revision sans the "rw" executable.
9
10 The main use case for rw is as a library, specifically one used by
11 SageMath. The "rw" executable was nice to have, but it pulls in
12 dev-libs/igraph, and igraph upstream has gone crazy and started
13 copy/pasting libraries into its "src" directory. Since igraph
14 will never be upgraded like that, it's staying unmaintained and
15 won't be stabilized, thereby blocking the stabilization of rw.
16
17 This commit drops the "rw" executable entirely, so that we can get rid
18 of the igraph dependency and stabilize a version of rw.
19
20 Package-Manager: Portage-2.3.84, Repoman-2.3.20
21 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
22
23 sci-mathematics/rw/metadata.xml | 4 ----
24 .../rw/{rw-0.8-r1.ebuild => rw-0.8-r2.ebuild} | 19 +++++--------------
25 2 files changed, 5 insertions(+), 18 deletions(-)
26
27 diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
28 index 76588843b8f..4a95d1f4b12 100644
29 --- a/sci-mathematics/rw/metadata.xml
30 +++ b/sci-mathematics/rw/metadata.xml
31 @@ -29,10 +29,6 @@
32 additions on masked integers" by Michael D. Adams and David S. Wise.
33 </longdescription>
34
35 - <use>
36 - <flag name="executable">Build the 'rw' program.</flag>
37 - </use>
38 -
39 <upstream>
40 <remote-id type="sourceforge">rankwidth</remote-id>
41 </upstream>
42
43 diff --git a/sci-mathematics/rw/rw-0.8-r1.ebuild b/sci-mathematics/rw/rw-0.8-r2.ebuild
44 similarity index 69%
45 rename from sci-mathematics/rw/rw-0.8-r1.ebuild
46 rename to sci-mathematics/rw/rw-0.8-r2.ebuild
47 index 4ccfc56281e..cd1ab5d589b 100644
48 --- a/sci-mathematics/rw/rw-0.8-r1.ebuild
49 +++ b/sci-mathematics/rw/rw-0.8-r2.ebuild
50 @@ -12,13 +12,10 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
51 LICENSE="GPL-2+"
52 SLOT="0"
53 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
54 -IUSE="+executable"
55 -
56 -DEPEND="executable? ( >=dev-libs/igraph-0.6 )"
57 +IUSE=""
58
59 # We have a file collision (librw.so) with xpaint, bug 560210.
60 -RDEPEND="${DEPEND}
61 - !media-gfx/xpaint"
62 +RDEPEND="!media-gfx/xpaint"
63
64 src_prepare() {
65 # The upstream tarball for v0.8 contains SYMLINKS to ar-lib,
66 @@ -30,13 +27,7 @@ src_prepare() {
67 }
68
69 src_configure() {
70 - econf $(use_enable executable)
71 -}
72 -
73 -src_install() {
74 - default
75 - # The examples graphs are meant to be fed uncompressed into the 'rw'
76 - # program. The rest of the docs are small so just leave everything
77 - # uncompressed.
78 - docompress -x /usr/share/doc/${PF}
79 + # The executable depends on igraph, which has gone off the rails
80 + # upstream and has copy/pasted ~10 libraries into its src/ directory.
81 + econf --disable-executable
82 }