gentoo (leap year) resync : 29.02.2020

3 files changed, 10 insertions, 25 deletions

diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 8c0d27493726..6f4d78083495 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,3 +1,3 @@
 DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da3755a891b7eee4c910e84556252a333a12fe0cf2eac88863a272cb8fa6d2cfa4c9f1e93bd88bc6a2d2 SHA512 609d46fd3c76e2eb1724cc3e3ff9354d13b3c15ce23b96bef9f73f02b490e1d8713146230db079fcc87f45f5acc0e04130dac04e27589836e20891c63219f3ec
-EBUILD rw-0.8-r1.ebuild 1204 BLAKE2B 0c7001cfb9db693278219016886e25868718053d477a492f7b09243f4e2643922d1833bef5d5bc20e39e861471db24d125d571d31950e5ed27552945ac5d78d3 SHA512 8a8e7bbee44abb53b223b486dd3e29cb3564a6d7d2da438fabbace3ef0d7a8d79778df1ce75f1356d4b65f0193ffe7a9125c474be82ea3df63224732fca85204
-MISC metadata.xml 1205 BLAKE2B 2a62216c8067754068d125f90f3783436feabb898db67e31d564646c73f135c1313db00ccdc9ef7f3ca7a2b722c1b232aa0964dfa6543a51e35825d29517b60a SHA512 9446c48fd0db0897c094556e191ee9262ef412c64b519b87edcc47e25bfcd2520bd85b2750dbf50f39ea6c91076775b2c3983f57c5fe7787a924be8e8f3ac94f
+EBUILD rw-0.8-r2.ebuild 997 BLAKE2B b0672882fb55ce59d0a61ad2dbb2af244ee10fb28b7360cfca9b5b5c107ef2479f5c6958dd61d6c207791079f30d540b557a8f72ed3acba993d1bb29a049edb8 SHA512 db1098d25921b53f35768eb7a465283a79c38a3e6cdaa17c19d7bbe1203ef52b39e596490dcbab8e0cb69161d04dcfd3f760df890aaec4325ee7f6b8470ec13d
+MISC metadata.xml 1128 BLAKE2B 30c263e8a47107c0c5d9a7ee5377a5deaa6260767734361b85eca07f5c1a88d8f2375f2c5d20a28cd1241fcf70a2dfcff16a7fc2886977dfd9f25b5388aa73bb SHA512 34ec83d5cf7d7ed12ef6c58291a6a1b8323d580121e8b489dadc569f09b184e6952cefd934da504542a7a4cbe5c59a781ff703dec21c7ee4010f31153144328c
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.
   </longdescription>
 
-  <use>
-    <flag name="executable">Build the 'rw' program.</flag>
-  </use>
-
   <upstream>
     <remote-id type="sourceforge">rankwidth</remote-id>
   </upstream>
diff --git a/sci-mathematics/rw/rw-0.8-r1.ebuild b/sci-mathematics/rw/rw-0.8-r2.ebuild
index 9a8731893982..cd1ab5d589b1 100644
--- a/sci-mathematics/rw/rw-0.8-r1.ebuild
+++ b/sci-mathematics/rw/rw-0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,33 +12,22 @@ 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 )"
+IUSE=""
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
-RDEPEND="${DEPEND}
-	!media-gfx/xpaint"
-
-DOCDIR="/usr/share/doc/${PF}"
+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.
-	eautoreconf
 	default
+	eautoreconf
 }
 
-src_configure(){
-	econf $(use_enable executable) --docdir="${EPREFIX}${DOCDIR}"
-}
-
-src_install(){
-	# 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 "${DOCDIR}"
-	default
+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
 }