From 31ded7e602d4797cdd012e18bfeca3751ee5b875 Mon Sep 17 00:00:00 2001
From: Sébastien Fabbro <bicatali@gentoo.org>
Date: Sun, 30 Jul 2017 00:53:46 +0000
Subject: sci-libs/bliss: fix gmp automagic, add prefix, minor cosmetic fixes

Package-Manager: Portage-2.3.6, Repoman-2.3.3
---
 sci-libs/bliss/bliss-0.73-r1.ebuild             | 48 ++++++++++++++++++++++++
 sci-libs/bliss/bliss-0.73.ebuild                | 50 -------------------------
 sci-libs/bliss/files/bliss-0.73-autotools.patch |  4 +-
 sci-libs/lrslib/lrslib-062.ebuild               |  1 -
 4 files changed, 50 insertions(+), 53 deletions(-)
 create mode 100644 sci-libs/bliss/bliss-0.73-r1.ebuild
 delete mode 100644 sci-libs/bliss/bliss-0.73.ebuild

(limited to 'sci-libs')

diff --git a/sci-libs/bliss/bliss-0.73-r1.ebuild b/sci-libs/bliss/bliss-0.73-r1.ebuild
new file mode 100644
index 000000000000..de9e1f385274
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.73-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gmp static-libs"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/
+PATCHES=(
+	"${FILESDIR}"/${P}-error.patch
+	"${FILESDIR}"/${P}-rehn.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die
+	rm Makefile || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gmp) $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake all $(usex doc html "")
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+	use doc && dodoc -r html
+}
diff --git a/sci-libs/bliss/bliss-0.73.ebuild b/sci-libs/bliss/bliss-0.73.ebuild
deleted file mode 100644
index 7995a4055cb2..000000000000
--- a/sci-libs/bliss/bliss-0.73.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
-DESCRIPTION="A Tool for Computing Automorphism Groups and Canonical Labelings of Graphs"
-HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/index.shtml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gmp static-libs"
-
-RDEPEND="gmp? ( dev-libs/gmp:0= )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/
-PATCHES=(
-	"${FILESDIR}/${P}-error.patch"
-	"${FILESDIR}/${P}-rehn.patch"
-	"${FILESDIR}/${P}-autotools.patch"
-)
-
-src_prepare() {
-	cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die
-	rm Makefile || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gmp) $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake all $(usex doc html "")
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}"/html/. )
-	default
-
-	#comes with pkg-config file
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/bliss/files/bliss-0.73-autotools.patch b/sci-libs/bliss/files/bliss-0.73-autotools.patch
index 1fe209efd020..efdbcb81b42a 100644
--- a/sci-libs/bliss/files/bliss-0.73-autotools.patch
+++ b/sci-libs/bliss/files/bliss-0.73-autotools.patch
@@ -32,8 +32,8 @@ diff -Naur bliss-0.72-fedora/configure.ac bliss-0.72/configure.ac
 +# Checks for libraries.
 +AC_ARG_WITH([gmp],
 +  [AS_HELP_STRING([--with-gmp], [enable support for GNU Multiple Precision Arithmetic Library @<:@default=check@:>@])],
-+  [], [with_readline=no])
-+AS_IF([test "x$with_readline" != xno],
++  [], [with_gmp=no])
++AS_IF([test "x$with_gmp" != xno],
 +  [AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Cannot find gmp.h header]))
 +    AC_CHECK_LIB([gmp],_init,,AC_MSG_ERROR([Cannot find gmp library]))
 +    AC_SUBST([GMP],[-lgmp])
diff --git a/sci-libs/lrslib/lrslib-062.ebuild b/sci-libs/lrslib/lrslib-062.ebuild
index 05e16755b179..3c9f00616900 100644
--- a/sci-libs/lrslib/lrslib-062.ebuild
+++ b/sci-libs/lrslib/lrslib-062.ebuild
@@ -18,7 +18,6 @@ RDEPEND="gmp? ( dev-libs/gmp:0=
 			  mpi? ( virtual/mpi ) )"
 DEPEND="${RDEPEND}"
 
-
 src_prepare(){
 	default
 	tc-export CC
-- 
cgit v1.2.3-65-gdbad