Now install a working library, bug #359975

(Portage version: 2.1.9.43/cvs/Linux x86_64)

4 files changed, 73 insertions, 40 deletions

diff --git a/sci-libs/ldl/ChangeLog b/sci-libs/ldl/ChangeLog
index e74cc3001ba8..64a21fc36b41 100644
--- a/sci-libs/ldl/ChangeLog
+++ b/sci-libs/ldl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/ldl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ldl/ChangeLog,v 1.3 2011/02/23 20:05:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ldl/ChangeLog,v 1.4 2011/03/22 18:10:40 bicatali Exp $
+
+*ldl-2.0.3-r1 (22 Mar 2011)
+
+  22 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -ldl-2.0.1.ebuild,
+  -ldl-2.0.3.ebuild, +ldl-2.0.3-r1.ebuild, +files/ldl-2.0.3-autotools.patch:
+  Now install a working library, bug #359975
 
 *ldl-2.0.3 (23 Feb 2011)
 
diff --git a/sci-libs/ldl/files/ldl-2.0.3-autotools.patch b/sci-libs/ldl/files/ldl-2.0.3-autotools.patch
new file mode 100644
index 000000000000..5e174999a5f3
--- /dev/null
+++ b/sci-libs/ldl/files/ldl-2.0.3-autotools.patch
@@ -0,0 +1,64 @@
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2008-01-30 12:45:53.174426797 +0000
+@@ -0,0 +1,10 @@
++# -*- Autoconf -*-
++AC_PREREQ(2.59)
++AC_INIT(ldl, 2.0.3, davis@cise.ufl.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++AC_CHECK_LIB(m, sqrt)
++AC_CHECK_HEADERS(UFconfig.h)
++AC_CONFIG_FILES([Makefile Source/Makefile Demo/Makefile])
++AC_OUTPUT
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2008-01-30 15:49:41.835515468 +0000
+@@ -0,0 +1,4 @@
++SUBDIRS = Source Demo
++EXTRA_DIST = README.txt
++include_HEADERS = Include/ldl.h
++
+--- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Source/Makefile.am	2008-01-30 12:49:25.858546974 +0000
+@@ -0,0 +1,11 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include
++
++LDLSRC=ldl.c
++lib_LTLIBRARIES = libldl.la
++noinst_LTLIBRARIES = libldli.la libldll.la
++libldli_la_SOURCES = $(LDLSRC)
++libldli_la_CPPFLAGS = $(AM_CPPFLAGS)
++libldll_la_SOURCES = $(LDLSRC)
++libldll_la_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
++libldl_la_SOURCES = 
++libldl_la_LIBADD = libldll.la libldli.la
+--- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Demo/Makefile.am	2008-01-30 15:43:45.603214946 +0000
+@@ -0,0 +1,27 @@
++LDADD = $(top_builddir)/Source/libldl.la -lm
++AM_CPPFLAGS =  -I$(top_srcdir)/Include
++check_PROGRAMS = ldlsimple ldllsimple ldlmain ldllmain ldlamd ldllamd
++
++ldlmain_SOURCES = ldlmain.c
++ldllmain_SOURCES = ldlmain.c
++ldllmain_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
++
++ldlsimple_SOURCES = ldlsimple.c
++ldllsimple_SOURCES = ldlsimple.c
++ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
++
++ldlamd_SOURCES = ldlamd.c
++ldllamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD
++ldllamd_SOURCES = ldlamd.c
++ldllamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG
++ldllamd_LDADD = $(LDADD) -lamd
++
++check-local: $(check_PROGRAMS)
++	@for i in $(check_PROGRAMS); do \
++		echo "Testing $$i"; \
++		./$$i > my_$$i.out; \
++		if ! diff $$i.out my_$$i.out; then \
++			echo "Testing $$i failed"; \
++			exit 1; \
++		fi \
++	done;
diff --git a/sci-libs/ldl/ldl-2.0.1.ebuild b/sci-libs/ldl/ldl-2.0.3-r1.ebuild
index 20459885d4bf..26cd645a00ea 100644
--- a/sci-libs/ldl/ldl-2.0.1.ebuild
+++ b/sci-libs/ldl/ldl-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ldl/ldl-2.0.1.ebuild,v 1.2 2010/12/25 18:51:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ldl/ldl-2.0.3-r1.ebuild,v 1.1 2011/03/22 18:10:40 bicatali Exp $
 
 EAPI=2
 inherit autotools eutils
diff --git a/sci-libs/ldl/ldl-2.0.3.ebuild b/sci-libs/ldl/ldl-2.0.3.ebuild
deleted file mode 100644
index 1e565e268d91..000000000000
--- a/sci-libs/ldl/ldl-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ldl/ldl-2.0.3.ebuild,v 1.1 2011/02/23 20:05:08 bicatali Exp $
-
-EAPI=2
-inherit autotools eutils
-
-MY_PN=LDL
-DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-DEPEND="sci-libs/ufconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.1-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/ldl_userguide.pdf || die
-	fi
-}