From 7d9d78d4154c1aa111a5316b7c4fd13bb4319fd1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 28 Feb 2020 07:51:34 -0500 Subject: sci-mathematics/rw: new revision sans the "rw" executable. The main use case for rw is as a library, specifically one used by SageMath. The "rw" executable was nice to have, but it pulls in dev-libs/igraph, and igraph upstream has gone crazy and started copy/pasting libraries into its "src" directory. Since igraph will never be upgraded like that, it's staying unmaintained and won't be stabilized, thereby blocking the stabilization of rw. This commit drops the "rw" executable entirely, so that we can get rid of the igraph dependency and stabilize a version of rw. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky --- sci-mathematics/rw/metadata.xml | 4 ---- sci-mathematics/rw/rw-0.8-r1.ebuild | 42 ------------------------------------- sci-mathematics/rw/rw-0.8-r2.ebuild | 33 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 46 deletions(-) delete mode 100644 sci-mathematics/rw/rw-0.8-r1.ebuild create mode 100644 sci-mathematics/rw/rw-0.8-r2.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml index 76588843b8fb..4a95d1f4b12d 100644 --- a/sci-mathematics/rw/metadata.xml +++ b/sci-mathematics/rw/metadata.xml @@ -29,10 +29,6 @@ additions on masked integers" by Michael D. Adams and David S. Wise. - - Build the 'rw' program. - - rankwidth diff --git a/sci-mathematics/rw/rw-0.8-r1.ebuild b/sci-mathematics/rw/rw-0.8-r1.ebuild deleted file mode 100644 index 4ccfc56281e1..000000000000 --- a/sci-mathematics/rw/rw-0.8-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Compute rank-width decompositions of graphs" -HOMEPAGE="https://sourceforge.net/projects/rankwidth/" -SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="+executable" - -DEPEND="executable? ( >=dev-libs/igraph-0.6 )" - -# We have a file collision (librw.so) with xpaint, bug 560210. -RDEPEND="${DEPEND} - !media-gfx/xpaint" - -src_prepare() { - # The upstream tarball for v0.8 contains SYMLINKS to ar-lib, - # compile, install-sh, ltmain.sh, etc. And those symlinks don't - # always point to a working location for us, so we have to - # (re)generate actual files for that stuff. Bug 696986. - default - eautoreconf -} - -src_configure() { - econf $(use_enable executable) -} - -src_install() { - default - # The examples graphs are meant to be fed uncompressed into the 'rw' - # program. The rest of the docs are small so just leave everything - # uncompressed. - docompress -x /usr/share/doc/${PF} -} diff --git a/sci-mathematics/rw/rw-0.8-r2.ebuild b/sci-mathematics/rw/rw-0.8-r2.ebuild new file mode 100644 index 000000000000..cd1ab5d589b1 --- /dev/null +++ b/sci-mathematics/rw/rw-0.8-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Compute rank-width decompositions of graphs" +HOMEPAGE="https://sourceforge.net/projects/rankwidth/" +SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="" + +# We have a file collision (librw.so) with xpaint, bug 560210. +RDEPEND="!media-gfx/xpaint" + +src_prepare() { + # The upstream tarball for v0.8 contains SYMLINKS to ar-lib, + # compile, install-sh, ltmain.sh, etc. And those symlinks don't + # always point to a working location for us, so we have to + # (re)generate actual files for that stuff. Bug 696986. + default + eautoreconf +} + +src_configure() { + # The executable depends on igraph, which has gone off the rails + # upstream and has copy/pasted ~10 libraries into its src/ directory. + econf --disable-executable +} -- cgit v1.2.3-65-gdbad