convert to EAPI=4, fix bugs 384195, 383811.

Package-Manager: portage-2.1.10.19/cvs/Linux i686

diff --git a/sci-libs/lrslib/ChangeLog b/sci-libs/lrslib/ChangeLog
index 0e5823a6d735af92cd3760dd6bb72a0cc013b590..55595a92ba65dd3b3a606e71a0ccbe0bb227e4ce 100644 (file)
--- a/sci-libs/lrslib/ChangeLog
+++ b/sci-libs/lrslib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/lrslib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/ChangeLog,v 1.6 2011/05/07 18:17:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/ChangeLog,v 1.7 2011/09/25 16:55:32 tomka Exp $
+
+*lrslib-042c-r2 (25 Sep 2011)
+
+  25 Sep 2011; Thomas Kahle <tomka@gentoo.org> +lrslib-042c-r2.ebuild:
+  Convert to EAPI=4, don't link gmp statically (bug 383811)
+  use -DB64 on amd64 (bug 384195).
 
   07 May 2011; Thomas Kahle <tomka@gentoo.org> -lrslib-042c.ebuild:
   Remove old

diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index d5b6cf140b65dbe6868e8b85f316a8fbbe932742..9f57d2fcfdfd18707b56aa5c483b4411f5cc38d3 100644 (file)
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -3,12 +3,13 @@ Hash: SHA256
 
 DIST lrslib-042c.tar.gz 168765 RMD160 ada5b8b74808edb78c250d62147489381babdf49 SHA1 5614ea18725aa6a00f3deeb61d096f9e3564d753 SHA256 53f99b5271397bb5f317c96fa365edc1ac71fa7cba0295c8bd79e0882f5c3a4a
 EBUILD lrslib-042c-r1.ebuild 1277 RMD160 580a3c744f633f825ea0e6788bdff875d8c11b64 SHA1 407559b701187667c4a4b42d16f3e81ac53c0dbc SHA256 a4625da4cd8d7cf16f2a5e9bf632d8834fa7aafa6393d3bfaa32ec2a7dbdf7e0
-MISC ChangeLog 917 RMD160 9dcfb4cd2c79136ff76a32947f5091c51e5fee6b SHA1 d990f87a2b383f1c01a832bc5810f5c03522b765 SHA256 f09de566b828ac885c5631cd2429e8023ccb97cbe8e76f32f3993f868f20b993
+EBUILD lrslib-042c-r2.ebuild 1425 RMD160 84304be34959d79ef1abee5e946f12400d95e00e SHA1 3e70aa0e5d3f3911d9305b044a68925f49a367e1 SHA256 43ce8a64e1346e8d4f2eeb39abe311b2a8e61b5563a0e2aaa658cd5f6c56b53d
+MISC ChangeLog 1115 RMD160 23f79b31e23dccdc8a25f2a0f5a97c187bcac06b SHA1 c538fb61425c1e318155ebedae5df0d63bea69f0 SHA256 a1f01938ddf8a48179ccb48cf0ae3db0f88f940fac6fc1a1c1c8c1705365edbc
 MISC metadata.xml 765 RMD160 6236dbfa082c47dcb2550ea7d5d83b00feba353d SHA1 a025db1e00999783793f335ea824699a5ad2fd87 SHA256 3f81025eb334261ea725a7af08f2c4187a0b9f5c5790590b9fe89cc9325eae8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3FizsACgkQodBTJSDyo65S5AD7BUQIT1+BWA+80t5SdDEpOSeM
-7NhvnxmUNQdV1m4Va8AA/jrEVEnwNgyRsqbQEPtLLp7Y30WRha+9I/zI1QGA0qrM
-=eu20
+iF4EAREIAAYFAk5/XQkACgkQodBTJSDyo66RsAD+PYIQrYtKqh5ooMUfHlhLYFHU
+L4EQ5o5LRIZ1eynb8lAA/R0G+oA7CGUQ1k2kIWUsBrSY7zRhcGOeDL5FlYe3y8dW
+=BzFw
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/lrslib/lrslib-042c-r2.ebuild b/sci-libs/lrslib/lrslib-042c-r2.ebuild
new file mode 100644 (file)
index 0000000..6a34513
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-042c-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/lrslib-042c-r2.ebuild,v 1.1 2011/09/25 16:55:31 tomka Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
+HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
+SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gmp"
+
+DEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+       sed -i "s/gcc/$(tc-getCC)/g" makefile || die
+       sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
+       # We don't like static linking to gmp or anywhere.
+       if use amd64 ; then
+               # This macro may only change messages that the
+               # binary outputs, but just in case... (Bug 384195)
+               sed -i "s/-static/-DB64/g" makefile || die
+       else
+               sed -i "s/-static//g" makefile || die
+       fi
+}
+
+src_compile () {
+       if use amd64 ; then
+               emake all64
+       else
+               emake
+       fi
+       if use gmp ; then
+               emake gmp
+       fi
+}
+
+src_install() {
+       dobin lrs redund redund1
+       # Collides with sys-block/buffer
+       newbin buffer lrsbuffer
+       if use x86; then
+               dobin nash setupnash setupnash2 2nash
+               # Prevent clash with cddlib:
+               newbin fourier lrsfourier
+       fi
+       if use gmp; then
+               dobin glrs gredund gfourier
+               # Clash with www-plugins/gnash
+               newbin gnash lrsgnash
+       fi
+       dodoc readme
+       dohtml lrslib.html
+}