Fixed file collision in bug 349765

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

2 files changed, 59 insertions, 1 deletions

diff --git a/sci-libs/lrslib/ChangeLog b/sci-libs/lrslib/ChangeLog
index 51cb5b0c5dd2..3bb6076e4a33 100644
--- a/sci-libs/lrslib/ChangeLog
+++ b/sci-libs/lrslib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/lrslib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/ChangeLog,v 1.2 2010/11/14 20:47:54 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/ChangeLog,v 1.3 2010/12/29 15:16:35 tomka Exp $
+
+*lrslib-042c-r1 (29 Dec 2010)
+
+  29 Dec 2010; Thomas Kahle <tomka@gentoo.org> +lrslib-042c-r1.ebuild:
+  Fixed file collision in bug 349765
 
   14 Nov 2010; Thomas Kahle <tomka@gentoo.org> lrslib-042c.ebuild:
   added missing || die statements
diff --git a/sci-libs/lrslib/lrslib-042c-r1.ebuild b/sci-libs/lrslib/lrslib-042c-r1.ebuild
new file mode 100644
index 000000000000..0950a5009f25
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-042c-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lrslib/lrslib-042c-r1.ebuild,v 1.1 2010/12/29 15:16:35 tomka Exp $
+
+EAPI=2
+
+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
+}
+
+src_compile () {
+	if use amd64 ; then
+		emake all64 || die "make failed"
+	else
+		emake || die "make failed"
+	fi
+	if use gmp ; then
+		emake gmp || die "make failed"
+	fi
+}
+
+src_install() {
+	dobin lrs redund redund1 || die
+	# Collides with sys-block/buffer
+	newbin buffer lrsbuffer || die
+	if use x86; then
+		dobin nash setupnash setupnash2 2nash || die
+		# Prevent clash with cddlib:
+		newbin fourier lrsfourier || die
+	fi
+	if use gmp; then
+		dobin glrs gredund gfourier || die
+		# Clash with www-plugins/gnash
+		newbin gnash lrsgnash || die
+	fi
+	dodoc readme || die
+	dohtml lrslib.html || die
+}