Now install a working library, bug #359975

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

5 files changed, 79 insertions, 47 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/Manifest b/sci-libs/ldl/Manifest
index 7e9730874bcf..96845061121c 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -2,16 +2,15 @@
 Hash: SHA1
 
 AUX ldl-2.0.1-autotools.patch 1987 RMD160 41d94bbe70ba6c6d608a0f0bdabc8ffe7c26ec81 SHA1 e2837c5bae5726d695a9273e10d076a349bb514f SHA256 45af4d76f60319e874607af037f5924fa739ce4bb62bf0d80722914be6214cab
-DIST LDL-2.0.1.tar.gz 225831 RMD160 340c3ca34eff36be90e9d3978c54e69382f8cc50 SHA1 93b0b2ad70793cef8873f3cd634a8043130d935f SHA256 bce5ded23ea79548b5ecdde94a7f0339cbe54cf8661105eb40ff17216f8ecef8
+AUX ldl-2.0.3-autotools.patch 2001 RMD160 d3c10f339dd6709b42be8353ecabc97f77679aac SHA1 9f9dbd33e1795c84f4c277801e1d493467cc50aa SHA256 ee59cb2ded5a7cd167e20993e63659bf31ca515c31d4fe5320dd3336c410ed11
 DIST LDL-2.0.3.tar.gz 325632 RMD160 a6c6d720ac254029b5b81f53e2d47e9c27ce6878 SHA1 c85cc1cd370f19208839cbcedb68dd2a47f043b6 SHA256 6809cdedf592e130b8416808401f38928a76e5975bb4ce05bde510a299de20a0
-EBUILD ldl-2.0.1.ebuild 950 RMD160 fa2b9c9b790bd29798c43b66d8c6c68d87a6d6a6 SHA1 61d12cf63582d1b9409caa6d0a37c5bf6d9c0261 SHA256 143cdac6e03771cd0fa643c3feda1467b5102eaa4272e1ddc6a5dcb814406288
-EBUILD ldl-2.0.3.ebuild 957 RMD160 8cd4ad97b23d2c385e5fb897c209bd22a78f1660 SHA1 d4d90b427e232adef6bb9c9bfe29484faa97cb88 SHA256 243bf7688e92ea2fb2e4bb0dbcbf8da804b7010d060725e9c7c26997d2c4a4b9
-MISC ChangeLog 600 RMD160 dc226ebed632d92771cba76ee01962c252af324a SHA1 00e3cafee4c7f8e92cb1972e7bd38f3016f48f73 SHA256 3db89649cec3e828f52e99ba5a55562d04ea37a550615ce09e49e27f1156f4a9
+EBUILD ldl-2.0.3-r1.ebuild 953 RMD160 776f7452dfcb26c6b632b8cf169ce39c4c4d43c2 SHA1 865368aff4c0a9201b806119b7c6917efbb8c221 SHA256 24f0d5bd9eb90025f95c410b4051a1c8a767158b0956ed902d5e6c418621b230
+MISC ChangeLog 826 RMD160 8d7b5e279474f6495a70d946c5545969cdcdcf01 SHA1 61551213a0cd16224495c9912b964730905a0435 SHA256 11b4339d94e56ea5612b29090cfb78f6e98b26687775b7ddb8e12d72f148f250
 MISC metadata.xml 792 RMD160 1a586da601f8eb7d9a5ccc3383f97c044da46470 SHA1 8b62f881416f996e30fdf46810af8728e1e663bf SHA256 c1b3768f1b6046b54a40d224ec04bee4828fe27a500657e956c41feb3cd1c1bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1lakMACgkQ1ycZbhPLE2CiAACgpRrO3Fv4SIMV+A3xk4Jn+B8K
-5xYAnRbOmuRB8p/64Z04Wvf3UJYtiQBo
-=/jNj
+iEYEARECAAYFAk2I5isACgkQ1ycZbhPLE2D6PgCgpr34G+UKmZ5WwsLLfgFMGbYX
+kL8AnikeWRkLiyCLWDWnkSQF7+5aSPaM
+=MOg/
 -----END PGP SIGNATURE-----
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
-}