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, 42 deletions

diff --git a/sci-libs/coinor-bcps/ChangeLog b/sci-libs/coinor-bcps/ChangeLog
index 5b86cfa87a65..b3b13308c212 100644
--- a/sci-libs/coinor-bcps/ChangeLog
+++ b/sci-libs/coinor-bcps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/coinor-bcps
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-bcps/ChangeLog,v 1.1 2014/01/14 21:49:28 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-bcps/ChangeLog,v 1.2 2014/01/15 18:32:48 bicatali Exp $
+
+  14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  coinor-bcps-0.93.9.ebuild:
+  Fixed license, cleanup, as-needed applied upstream
 
 *coinor-bcps-0.93.8 (07 Dec 2013)
 
diff --git a/sci-libs/coinor-bcps/Manifest b/sci-libs/coinor-bcps/Manifest
index 08870751142c..847b26226afd 100644
--- a/sci-libs/coinor-bcps/Manifest
+++ b/sci-libs/coinor-bcps/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST Bcps-0.93.9.tgz 6272327 SHA256 51bbd3bde0e0727cd127fea47073e13975dce8f8691928cbf32ec454800b514a SHA512 23dd3167072ba7393075f255fa01fe799bfec807b5aa02438b40682862ba40b09cd11a2703d98812bbe31fe1592247495bb15cd24ecba2c3aba5280dbb959b62 WHIRLPOOL 21ed583e8da124377cbc8f0a5ee05c047bc1aaa224b863ca6017d9557681d960c21369a0aec768e1db5592b4275bfb41940dd64993bd3305a9ae20b0da748900
-EBUILD coinor-bcps-0.93.9.ebuild 1642 SHA256 6d20c58d592491ddc7c03f451dab510972770a4e9abea49053ff221610acb89a SHA512 f1a371ec7a7ad8e61161e662330c607818f24a3b23b7d41193ed9e9b2442e813f1720e0aab189d33ccd0a3f2d6030ded247d7a19c4fd25ed5b32b30ef1ea6b07 WHIRLPOOL b9c71919ebdf662714d1db04ebc9a7510164dd2705031e4fea71918f7f39c7313d7067092b3fdfcc3b571bcd4e627c61dafadfd3ab7a8322f1d1dc89ec959198
-MISC ChangeLog 761 SHA256 87bd3c92f003f5ca67f92dd8b8822176f5ae8013c7fbbf48f54f143b98f3b780 SHA512 7404200a1d7bc85bfdae140cff7194cf186092e6430f201b4c93c4750c69e3bdf4d51d8cfcfd9617a50ae36bd1598e985340bed83490a6c9f3543efee54cc9df WHIRLPOOL f73d3cb8bb40546d5348db20fc1dc68d8bf3f19a417d8857556201636af989bfb9c3bb29b3436aed2672b0b97dfc47f50bd26e63d14e6d8c40e8fb665e7e3f44
+EBUILD coinor-bcps-0.93.9.ebuild 1042 SHA256 a98f2c950de8c57cb170d8317d1f2b6c012b0bb651e794e77bb0d150fd35343f SHA512 6be3c4d39ce720a32fa52ad9ff3a567d83514b074de411336876d685435861767c32a1832bcb6b73e5d307fb5e163aa490fea746a0983ce8bdee44aa020e10d4 WHIRLPOOL afadd6495651aedd12e818cd1eb8d4a5d9589e3ffae5d7255bbb28c2d10d707d8ddc29a2043abdb253d5bb3267bc2ff8011db5d207b5fc19941589463ee7b694
+MISC ChangeLog 899 SHA256 7a07fe0f1f47fc2c8ea07cac632f46257982080eaadaf18c9b93e8cf2496931e SHA512 68e1c3728f74b7eb3cc5914e814805a48b679c87452d14979d4e2a8b963479d2cc3076c5e07f253ab66a1eba6f3551908b89a2534463c47989da6961cacb4919 WHIRLPOOL 4d1946957a4f989aac0b4d07159252c7c2d831ef64a2d30f49c9894675123b4df669cd2f68a73de3cf5d5afe6c55928b080c3f423a339198b5dedff0562d4868
 MISC metadata.xml 572 SHA256 33df33b324af6807e1bd61de0723aac72db9c913570299b63bb36d2f27129354 SHA512 0a37ef64df09d429d50a3cc3f3c643cb9fc3c309928bc4ebf01a9e17fc145a6a7c9c423e6b7b0a3d12e743209669be7277b0964bbf4aeee2be22f4e7c64613fb WHIRLPOOL b6f30da6a58114c77991e25d8b438d0dd9e2cc98846f63e0b956936031480680b69456cd94d8897c069570b511d338a221fe3c31a0da2d8c9bd6ef26cb97251a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLVsOkACgkQ1ycZbhPLE2AYyACgrWWGoqy2QGqDiJ+0nzG70kPF
-pS8AmQG65jIuwyMeluQ1UjHtKAmDGUb/
-=AXED
------END PGP SIGNATURE-----
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.93.9.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.93.9.ebuild
index c0cdffa6db2f..7cae43087a8c 100644
--- a/sci-libs/coinor-bcps/coinor-bcps-0.93.9.ebuild
+++ b/sci-libs/coinor-bcps/coinor-bcps-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-bcps/coinor-bcps-0.93.9.ebuild,v 1.1 2014/01/14 21:49:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-bcps/coinor-bcps-0.93.9.ebuild,v 1.2 2014/01/15 18:32:48 bicatali Exp $
 
 EAPI=5
 
@@ -12,10 +12,10 @@ DESCRIPTION="COIN-OR BiCEPS data handling library"
 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:=
@@ -23,43 +23,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:\(libBcps_la_LIBADD.*=\).*:\1 @BCPSLIB_LIBS@:g' \
-		src/Makefile.in || die
-	# bug for later versions of subversions
-	sed -i \
-		-e 's/xexported/xexported -a "x$svn_rev_tmp" != "xUnversioned directory"/' \
-		configure
-}
-
 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}