| 1 |
commit: 31ded7e602d4797cdd012e18bfeca3751ee5b875 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 30 00:53:46 2017 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 31 18:12:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ded7e6 |
| 7 |
|
| 8 |
sci-libs/bliss: fix gmp automagic, add prefix, minor cosmetic fixes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../{bliss-0.73.ebuild => bliss-0.73-r1.ebuild} | 26 ++++++++++------------ |
| 13 |
sci-libs/bliss/files/bliss-0.73-autotools.patch | 4 ++-- |
| 14 |
sci-libs/lrslib/lrslib-062.ebuild | 1 - |
| 15 |
3 files changed, 14 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/bliss/bliss-0.73.ebuild b/sci-libs/bliss/bliss-0.73-r1.ebuild |
| 18 |
similarity index 61% |
| 19 |
rename from sci-libs/bliss/bliss-0.73.ebuild |
| 20 |
rename to sci-libs/bliss/bliss-0.73-r1.ebuild |
| 21 |
index 7995a4055cb..de9e1f38527 100644 |
| 22 |
--- a/sci-libs/bliss/bliss-0.73.ebuild |
| 23 |
+++ b/sci-libs/bliss/bliss-0.73-r1.ebuild |
| 24 |
@@ -6,30 +6,30 @@ EAPI=6 |
| 25 |
inherit autotools |
| 26 |
|
| 27 |
SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip" |
| 28 |
-DESCRIPTION="A Tool for Computing Automorphism Groups and Canonical Labelings of Graphs" |
| 29 |
-HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/index.shtml" |
| 30 |
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs" |
| 31 |
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/" |
| 32 |
|
| 33 |
-LICENSE="GPL-3" |
| 34 |
-SLOT="0" |
| 35 |
-KEYWORDS="~amd64 ~x86" |
| 36 |
+LICENSE="LGPL-3" |
| 37 |
+SLOT="0/1" |
| 38 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 39 |
IUSE="doc gmp static-libs" |
| 40 |
|
| 41 |
RDEPEND="gmp? ( dev-libs/gmp:0= )" |
| 42 |
- |
| 43 |
DEPEND="${RDEPEND} |
| 44 |
+ app-arch/unzip |
| 45 |
doc? ( app-doc/doxygen )" |
| 46 |
|
| 47 |
#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/ |
| 48 |
PATCHES=( |
| 49 |
- "${FILESDIR}/${P}-error.patch" |
| 50 |
- "${FILESDIR}/${P}-rehn.patch" |
| 51 |
- "${FILESDIR}/${P}-autotools.patch" |
| 52 |
+ "${FILESDIR}"/${P}-error.patch |
| 53 |
+ "${FILESDIR}"/${P}-rehn.patch |
| 54 |
+ "${FILESDIR}"/${P}-autotools.patch |
| 55 |
) |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
+ default |
| 59 |
cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die |
| 60 |
rm Makefile || die |
| 61 |
- default |
| 62 |
eautoreconf |
| 63 |
} |
| 64 |
|
| 65 |
@@ -42,9 +42,7 @@ src_compile() { |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
| 69 |
- use doc && HTML_DOCS=( "${S}"/html/. ) |
| 70 |
default |
| 71 |
- |
| 72 |
- #comes with pkg-config file |
| 73 |
- find "${ED}" -name '*.la' -delete || die |
| 74 |
+ use static-libs || find "${ED}" -name '*.la' -delete |
| 75 |
+ use doc && dodoc -r html |
| 76 |
} |
| 77 |
|
| 78 |
diff --git a/sci-libs/bliss/files/bliss-0.73-autotools.patch b/sci-libs/bliss/files/bliss-0.73-autotools.patch |
| 79 |
index 1fe209efd02..efdbcb81b42 100644 |
| 80 |
--- a/sci-libs/bliss/files/bliss-0.73-autotools.patch |
| 81 |
+++ b/sci-libs/bliss/files/bliss-0.73-autotools.patch |
| 82 |
@@ -32,8 +32,8 @@ diff -Naur bliss-0.72-fedora/configure.ac bliss-0.72/configure.ac |
| 83 |
+# Checks for libraries. |
| 84 |
+AC_ARG_WITH([gmp], |
| 85 |
+ [AS_HELP_STRING([--with-gmp], [enable support for GNU Multiple Precision Arithmetic Library @<:@default=check@:>@])], |
| 86 |
-+ [], [with_readline=no]) |
| 87 |
-+AS_IF([test "x$with_readline" != xno], |
| 88 |
++ [], [with_gmp=no]) |
| 89 |
++AS_IF([test "x$with_gmp" != xno], |
| 90 |
+ [AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Cannot find gmp.h header])) |
| 91 |
+ AC_CHECK_LIB([gmp],_init,,AC_MSG_ERROR([Cannot find gmp library])) |
| 92 |
+ AC_SUBST([GMP],[-lgmp]) |
| 93 |
|
| 94 |
diff --git a/sci-libs/lrslib/lrslib-062.ebuild b/sci-libs/lrslib/lrslib-062.ebuild |
| 95 |
index 05e16755b17..3c9f0061690 100644 |
| 96 |
--- a/sci-libs/lrslib/lrslib-062.ebuild |
| 97 |
+++ b/sci-libs/lrslib/lrslib-062.ebuild |
| 98 |
@@ -18,7 +18,6 @@ RDEPEND="gmp? ( dev-libs/gmp:0= |
| 99 |
mpi? ( virtual/mpi ) )" |
| 100 |
DEPEND="${RDEPEND}" |
| 101 |
|
| 102 |
- |
| 103 |
src_prepare(){ |
| 104 |
default |
| 105 |
tc-export CC |
Archives