[gentoo-commits] proj/sci:master commit in: sci-libs/dsdp/, sci-libs/dsdp/files/

[Sebastien Fabbro]

commit:     3605f056cf642519c64e03544115555b3d347ec2
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Mon Jul  9 17:55:01 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 17:55:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3605f056

sci-libs/dsdp: changes incorporated in main tree

---
 sci-libs/dsdp/ChangeLog                       |   42 --------------
 sci-libs/dsdp/dsdp-5.8-r2.ebuild              |   75 -------------------------
 sci-libs/dsdp/files/dsdp-5.8-gold.patch       |   13 ----
 sci-libs/dsdp/files/dsdp-5.8-malloc.patch     |   10 ---
 sci-libs/dsdp/files/dsdp-5.8-readsdpa.patch   |   11 ----
 sci-libs/dsdp/files/dsdp-5.8-sharedmake.patch |   36 ------------
 sci-libs/dsdp/metadata.xml                    |   21 -------
 7 files changed, 0 insertions(+), 208 deletions(-)

diff --git a/sci-libs/dsdp/ChangeLog b/sci-libs/dsdp/ChangeLog
deleted file mode 100644
index 464c42e..0000000
--- a/sci-libs/dsdp/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-# ChangeLog for sci-libs/dsdp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/ChangeLog,v 1.5 2012/01/17 17:36:56 bicatali Exp $
-
-  11 Apr 2012; François Bissey <francois.bissey@×××××××××××××.nz>
-  files/dsdp-5.8-gold.patch:
-  fix test
-
-*dsdp-5.8-r2 (04 Apr 2012)
-
-  04 Apr 2012; François Bissey <francois.bissey@×××××××××××××.nz>
-  +dsdp-5.8-r2.ebuild, +files/dsdp-5.8-gold.patch,
-  +files/dsdp-5.8-malloc.patch, +files/dsdp-5.8-readsdpa.patch,
-  +files/dsdp-5.8-sharedmake.patch, +metadata.xml:
-  Massive amount of fixes: work on macos prefix with correct dylib, removal of
-  malloc.h, stdlib.h is enough on modern 
-  systems. Fix parallel make - there was a direct call to make in make.include.
-  Fix bug 410735 and link to lapack properly.
-
-*dsdp-5.8-r1 (17 Jan 2012)
-
-  17 Jan 2012; Sébastien Fabbro <bicatali@g.o> -dsdp-5.8.ebuild,
-  +dsdp-5.8-r1.ebuild:
-  Now installs header files as well, bug #399035
-
-  28 Jun 2011; Justin Lecher <jlec@g.o> dsdp-5.8.ebuild, metadata.xml:
-  Fix sed on *FLAGS from : to |
-
-  05 Jun 2011; Justin Lecher <jlec@g.o> dsdp-5.8.ebuild,
-  +files/dsdp-5.8-gold.patch:
-  Make it gold resistant, #370109
-
-  14 Mar 2011; Sébastien Fabbro <bicatali@g.o> dsdp-5.8.ebuild,
-  +files/dsdp-5.8-readsdpa.patch:
-  Fixed leak in one of the examples
-
-*dsdp-5.8 (07 Mar 2011)
-
-  07 Mar 2011; Sébastien Fabbro <bicatali@g.o> +dsdp-5.8.ebuild,
-  +metadata.xml:
-  Initial import
-

diff --git a/sci-libs/dsdp/dsdp-5.8-r2.ebuild b/sci-libs/dsdp/dsdp-5.8-r2.ebuild
deleted file mode 100644
index c93546b..0000000
--- a/sci-libs/dsdp/dsdp-5.8-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/dsdp-5.8-r1.ebuild,v 1.1 2012/01/17 17:36:56 bicatali Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator multilib
-
-MYP=DSDP${PV}
-
-DESCRIPTION="Software for interior-point for semidefinite programming"
-HOMEPAGE="http://www.mcs.anl.gov/hs/software/DSDP/"
-SRC_URI="http://www.mcs.anl.gov/hs/software/DSDP//${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc examples"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-readsdpa.patch \
-		"${FILESDIR}"/${P}-gold.patch \
-		"${FILESDIR}"/${P}-sharedmake.patch \
-		"${FILESDIR}"/${P}-malloc.patch
-	find . -name Makefile -exec \
-		sed -i -e 's:make :$(MAKE) :g' '{}' \;
-
-	local sharedlib="-Wl,-soname=lib${PN}$(get_libname $(get_major_version))"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sharedlib="-Wl,-install_name -Wl,${EPREFIX}/usr/$(get_libdir)/lib${PN}$(get_libname $(get_major_version))"
-	fi
-
-	sed -i \
-		-e "s|#\(DSDPROOT[[:space:]]*=\).*|\1${S}|" \
-		-e "s|\(CC[[:space:]]*=\).*|\1$(tc-getCC)|" \
-		-e "s|\(OPTFLAGS[[:space:]]*=\).*|\1${CFLAGS}|" \
-		-e "s|\(LAPACKBLAS[[:space:]]*=\).*|\1 $(pkg-config --libs blas lapack)|" \
-		-e "s|\(^ARCH[[:space:]]*=\).*|\1$(tc-getAR) cr|" \
-		-e "s|\(^RANLIB[[:space:]]*=\).*|\1$(tc-getRANLIB)|" \
-		-e "s|libdsdp.so|lib${PN}$(get_libname $(get_major_version))|" \
-		make.include
-	# separate SH_LD due to weird sed behavior
-	sed -i "s:SH_LD =:SH_LD=$(tc-getCC) -shared ${LDFLAGS} ${sharedlib}:g" \
-		make.include
-}
-
-src_compile() {
-	emake OPTFLAGS="${CFLAGS} -fPIC" dsdplibrary
-}
-
-src_test() {
-	emake -j1 example test
-}
-
-src_install() {
-	dolib.so lib/lib${PN}$(get_libname $(get_major_version))
-	dosym lib${PN}$(get_libname $(get_major_version)) /usr/$(get_libdir)/lib${PN}$(get_libname)
-
-	insinto /usr/include
-	doins include/*.h src/sdp/*.h
-
-	use doc && dodoc docs/*.pdf
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/dsdp/files/dsdp-5.8-gold.patch b/sci-libs/dsdp/files/dsdp-5.8-gold.patch
deleted file mode 100644
index 2194c94..0000000
--- a/sci-libs/dsdp/files/dsdp-5.8-gold.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/examples/Makefile b/examples/Makefile
-index 8d7d433..11b9c8c 100644
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -4,7 +4,7 @@ default:
- 
- include ../make.include
- 
--EXAMPLE_LIBS = ${DSDPLIB} ${LAPACKBLAS}
-+EXAMPLE_LIBS = -L${DSDPROOT}/lib -ldsdp ${LAPACKBLAS} -lm
- 
- dsdp: exinfo clean
- 	${MEX} -I${DSDPROOT}/include dsdp.c ${DSDPLIB}; 

diff --git a/sci-libs/dsdp/files/dsdp-5.8-malloc.patch b/sci-libs/dsdp/files/dsdp-5.8-malloc.patch
deleted file mode 100644
index 48e067d..0000000
--- a/sci-libs/dsdp/files/dsdp-5.8-malloc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sys/dsdploginfo.c.orig	2012-04-04 09:59:25.212518434 +1200
-+++ src/sys/dsdploginfo.c	2012-04-04 10:00:05.676522161 +1200
-@@ -6,7 +6,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include "dsdpsys.h"
- #include "dsdpbasictypes.h"
- 

diff --git a/sci-libs/dsdp/files/dsdp-5.8-readsdpa.patch b/sci-libs/dsdp/files/dsdp-5.8-readsdpa.patch
deleted file mode 100644
index f555e50..0000000
--- a/sci-libs/dsdp/files/dsdp-5.8-readsdpa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/readsdpa.c.orig	2011-03-14 16:49:10.000000000 +0000
-+++ examples/readsdpa.c	2011-03-14 17:05:52.000000000 +0000
-@@ -87,7 +87,7 @@
-   double   ddobj,ppobj,scl,dpot;
-   char     problemname[100],thisline[100], filename[300],savefile[100];
-   char     directory[100]="/home/benson/sdpexamples/sdplib/";
--  char     outputfile[50]="",suffix[20]=".dat-s", tablename[20]="results-dsdp-5.8";
-+  char     outputfile[50]="",suffix[20]=".dat-s", tablename[100]="results-dsdp-5.8";
-   char     success='s',sformat;
-   FILE     *fp1=0,*fp2=0,*fout;
-   DSDPData dddd;

diff --git a/sci-libs/dsdp/files/dsdp-5.8-sharedmake.patch b/sci-libs/dsdp/files/dsdp-5.8-sharedmake.patch
deleted file mode 100644
index 3a146b9..0000000
--- a/sci-libs/dsdp/files/dsdp-5.8-sharedmake.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	2005-10-22 08:31:14.000000000 +1300
-+++ Makefile	2012-04-03 14:22:10.488043308 +1200
-@@ -10,8 +10,8 @@
- include make.include
- 
- dsdplibrary: chkroot info
--	cd ${D1}; make all
--	${RANLIB} ${DSDPLIB}
-+	make -C ${D1} all
-+	${SH_LD} -o ${DSDPLIBSO} lib/*.o ${LAPACKBLAS};
- 
- example:
- 	cd ${D2}; make most
---- make.include.orig	2005-10-22 08:31:14.000000000 +1300
-+++ make.include	2012-04-04 12:48:12.190409224 +1200
-@@ -48,7 +48,7 @@
- #CLINKER	= ${CXX} ${OPTFLAGS} -static
- #CLINKER	= link /out:dsdp5.exe
- 
--#SH_LD = ${CC} -shared -W1,-soname,
-+SH_LD =
- 
- # STEP 5:
- # Location of BLAS AND LAPACK libraries. 
-@@ -90,9 +90,8 @@
- PP	 = ../
- 
- dsdplib: ${DSDPOBJ}
--	${ARCH} ${DSDPLIB} ${DSDPOBJ}
--	${RANLIB} ${DSDPLIB}	
--	make clean
-+	${CP} ${DSDPOBJ} -t ${DSDPROOT}/lib
-+	$(MAKE) clean
- 
- .c.o: 
- 	${CC} ${CFLAGS} ${DCFLAGS} -c $*.c

diff --git a/sci-libs/dsdp/metadata.xml b/sci-libs/dsdp/metadata.xml
deleted file mode 100644
index 1b56f87..0000000
--- a/sci-libs/dsdp/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
-  The DSDP software is a free open source implementation of an
-  interior-point method for semidefinite programming. It provides
-  primal and dual solutions, exploits low-rank structure and sparsity
-  in the data, and has relatively low memory requirements for an
-  interior-point method. It allows feasible and infeasible starting
-  points and provides approximate certificates of infeasibility when
-  no feasible solution exists. The dual-scaling algorithm implemented
-  in this package has a convergence proof and worst-case polynomial
-  complexity under mild assumptions on the data. Furthermore, the
-  solver offers scalable parallel performance for large problems and a
-  well documented interface. Some of the most popular applications of
-  semidefinite programming and linear matrix inequalities (LMI) are
-  model control, truss topology design, and semidefinite relaxations
-  of combinatorial and global optimization problems.
-</longdescription>
-</pkgmetadata>