Fixed license, cleanup, as-needed applied upstream

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 15 insertions, 38 deletions

diff --git a/sci-libs/coinor-blis/ChangeLog b/sci-libs/coinor-blis/ChangeLog
index a158779d5dc7..89c35a91e23b 100644
--- a/sci-libs/coinor-blis/ChangeLog
+++ b/sci-libs/coinor-blis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/coinor-blis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-blis/ChangeLog,v 1.1 2014/01/14 21:51:36 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-blis/ChangeLog,v 1.2 2014/01/15 19:29:32 bicatali Exp $
+
+  14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  coinor-blis-0.93.9.ebuild:
+  Fixed license, cleanup, as-needed applied upstream
 
 *coinor-blis-0.93.8 (07 Dec 2013)
 
diff --git a/sci-libs/coinor-blis/Manifest b/sci-libs/coinor-blis/Manifest
index f3a3e7c7367d..4ac5599244ce 100644
--- a/sci-libs/coinor-blis/Manifest
+++ b/sci-libs/coinor-blis/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST Blis-0.93.9.tgz 10607858 SHA256 70422be013d418babf1918d3035ac8a6408de393d53e2bbbc65c54042f0eeb8f SHA512 5104820fc828d60f5c5b230a4dad144477869ff50c89109edb64d3ba25d8eb3008871b66d357dd720044ff66ee44cef3287c6510cef0116f5ec5bee7cf408ece WHIRLPOOL 7095564b98b518ef0c32eb5ea7ade6471457bd263b1663c34d5dde2a7d4ae22e10f7d2d4cee07f58e89d2a8e4d9cda9ccb792e6f68ec4b0988d15ba43905a864
-EBUILD coinor-blis-0.93.9.ebuild 1524 SHA256 7c38b268c6d593dd042ad0a3789776727ab70887e056ea8cf347c43604b3a4d6 SHA512 b389c4f45fe1bb5b3eaed82fb030a0f23487e40e44550b0ab3da23057f24742a1b2ea61a3197db046354b1133e0ae743bccca1fb97dfe4fdc306f510f11e0f44 WHIRLPOOL 2012b8d015c4296c0def1b64fd35a8a286b770a025612a7a632964b8f400b48ad9cbef932265e05fe5cf1bd5208970d814cc5c2e49a5d0389b87347b8646d26b
-MISC ChangeLog 1089 SHA256 0ed4cda8242a04e028a03432cfcfd8884a0768aea851cff92402a240cd8dd800 SHA512 412ac9b46f7999596d5ce064477eb785218273f6753f89174d6ca9686b235fddd553e270f2294371cfb4be51122bbad3dec66485bc2b6f0caeb1cc4879083037 WHIRLPOOL 605214a66237102283860f8f7d7aa7333b59a93aa26fd193ebebe1a4d479b10d45bc35465298c4e8f10c26eb2c0c7d2d16721209bd6b7cbbe9c91789c12701a7
+EBUILD coinor-blis-0.93.9.ebuild 1066 SHA256 e2ad6aba45d62c6bf7225cb88df42d8e7560a746ce6f33f13a21dc179cc5ba94 SHA512 41a02931a07e8d823b00b5c7ca33910c3044f9bdf7383914c1745f6c3b736027b2bd5868393350bf2d033e1392320a56fd79e12f71fe07e16f9f23a2e7b1404d WHIRLPOOL fb5ca5cb46154806f06ce45cb000592df8f9a51b9b672abc7ccc44321742193c6548f661d263fd859226071d2fdf495f100bf28bcb908a6cf6e37e909e3746cd
+MISC ChangeLog 1227 SHA256 dc9845784023ee86a6dd0ec4a0d7f87f7a9bee6b0d000324cf3655b43a72e1a6 SHA512 937e5cc365310156e1ee33e9cbac7115ff3d9df138decf07c8849e9af21cf42c23d1b689cc01268bca33dddb303353efa243dfd7f0a7854c5f1e953625b38502 WHIRLPOOL 9f9858f017259cc70d6bae15e3b1bbd4c32d45c224c10a6a3cbea2ffaffa28aca0163dac8667732723109f25b1dc3cc9564a9399ce6b6ee1863a7a81a9a3a630
 MISC metadata.xml 531 SHA256 46cbe4b192dc33181834d4819fdc8f3e3c1de442632269b0342fc6650e145120 SHA512 ef3062f53998120d8dcdf2d1d4bf6b365e9aeed8c85e9dc8f0277ffec35485d0880b81bf53fce2af041e4cf018dd74502c092c3da577c98e30a0dabdbc3e8f75 WHIRLPOOL 805b115e58442c815014c60b553adc0e77d97feb6401c61ca90c88a538399c339955fc84df13b49c1f74e482e60a41df7de19ddb06e22854fc97a03ab725508d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLVsWkACgkQ1ycZbhPLE2D6YgCeN947XLhgrtdhxQ8U63QSy/AW
-IZAAn20p7MMQ4rBK+92veMkISJUb2r+M
-=wzzw
------END PGP SIGNATURE-----
diff --git a/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild b/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild
index 5ec5c89d53e8..d6cd4f35fa42 100644
--- a/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild
+++ b/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild,v 1.1 2014/01/14 21:51:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-blis/coinor-blis-0.93.9.ebuild,v 1.2 2014/01/15 19:29:32 bicatali Exp $
 
 EAPI=5
 
@@ -12,10 +12,10 @@ DESCRIPTION="COIN-OR BiCePS Linear Integer Solver"
 HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
 SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
 
-LICENSE="EPL-1.0"
+LICENSE="CPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="examples static-libs test"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
@@ -24,39 +24,22 @@ RDEPEND="
 	sci-libs/coinor-alps:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
 	test? ( sci-libs/coinor-sample )"
 
 S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
 
-src_prepare() {
-	# as-needed fix
-	# hack to avoid eautoreconf (coinor has its own weird autotools)
-	sed -i \
-		-e 's:\(libBlis_la_LIBADD.*=\).*:\1 @BLISLIB_LIBS@:g' \
-		src/Makefile.in || die
-}
-
 src_configure() {
 	local myeconfargs=(
-		$(use_with doc dot)
+		--enable-dependency-linking
 	)
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
-		autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo doxydoc)
+	autotools-utils_src_configure
 }
 
 src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	emake test
-	popd > /dev/null || die
+	autotools-utils_src_test test
 }
 
 src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
 	autotools-utils_src_install
 	if use examples; then
 		insinto /usr/share/doc/${PF}