From f44f0193a792635ea779651f2d2c50a9b0ccc7ae Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Sun, 16 Oct 2016 10:23:36 -0400
Subject: sci-mathematics/rw: new revision with a blocker on media-gfx/xpaint.

We have a file collision (librw.so) with xpaint. Barring a better
solution, we should at least block it in RDEPEND so that users don't
see the collision. This new revision adds "!media-gfx/xpaint" to
RDEPEND.

Gentoo-Bug: 560210

Package-Manager: portage-2.3.0
---
 sci-mathematics/rw/rw-0.7-r1.ebuild | 32 --------------------------------
 sci-mathematics/rw/rw-0.7-r2.ebuild | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 32 deletions(-)
 delete mode 100644 sci-mathematics/rw/rw-0.7-r1.ebuild
 create mode 100644 sci-mathematics/rw/rw-0.7-r2.ebuild

(limited to 'sci-mathematics')

diff --git a/sci-mathematics/rw/rw-0.7-r1.ebuild b/sci-mathematics/rw/rw-0.7-r1.ebuild
deleted file mode 100644
index ba4627f1b9dd..000000000000
--- a/sci-mathematics/rw/rw-0.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Compute rank-width decompositions of graphs"
-AUTHORPAGE="http://pholia.tdi.informatik.uni-frankfurt.de/~philipp/"
-HOMEPAGE="${AUTHORPAGE}software/${PN}.shtml"
-SRC_URI="${AUTHORPAGE}/software/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="+executable"
-
-DEPEND="executable? ( >=dev-libs/igraph-0.6 )"
-RDEPEND="${DEPEND}"
-
-DOCDIR="/usr/share/doc/${PF}"
-
-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
-}
diff --git a/sci-mathematics/rw/rw-0.7-r2.ebuild b/sci-mathematics/rw/rw-0.7-r2.ebuild
new file mode 100644
index 000000000000..e0712fd8a29f
--- /dev/null
+++ b/sci-mathematics/rw/rw-0.7-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Compute rank-width decompositions of graphs"
+AUTHORPAGE="http://pholia.tdi.informatik.uni-frankfurt.de/~philipp/"
+HOMEPAGE="${AUTHORPAGE}software/${PN}.shtml"
+SRC_URI="${AUTHORPAGE}software/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux ~ppc-macos ~x86-macos ~x64-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"
+
+DOCDIR="/usr/share/doc/${PF}"
+
+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
+}
-- 
cgit v1.2.3-65-gdbad