sci-libs/bliss: fix gmp automagic, add prefix, minor cosmetic fixes

Package-Manager: Portage-2.3.6, Repoman-2.3.3

3 files changed, 14 insertions, 17 deletions

diff --git a/sci-libs/bliss/bliss-0.73.ebuild b/sci-libs/bliss/bliss-0.73-r1.ebuild
index 7995a4055cb2..de9e1f385274 100644
--- a/sci-libs/bliss/bliss-0.73.ebuild
+++ b/sci-libs/bliss/bliss-0.73-r1.ebuild
@@ -6,30 +6,30 @@ 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"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/"
 
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"
+	"${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
-	default
 	eautoreconf
 }
 
@@ -42,9 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}"/html/. )
 	default
-
-	#comes with pkg-config file
-	find "${ED}" -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete
+	use doc && dodoc -r html
 }
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