Version bump

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 14 insertions, 45 deletions

diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
index eca64f5437de..eeb49085ce92 100644
--- a/sci-libs/adolc/ChangeLog
+++ b/sci-libs/adolc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/adolc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.3 2013/03/03 19:10:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.4 2013/05/26 15:55:01 bicatali Exp $
+
+*adolc-2.4.1 (26 May 2013)
+
+  26 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +adolc-2.4.1.ebuild,
+  -adolc-2.3.0-r1.ebuild, -files/adolc-2.3.0-libdir.patch,
+  -files/adolc-2.3.0-no-colpack.patch:
+  Version bump
 
 *adolc-2.4.0 (03 Mar 2013)
 
diff --git a/sci-libs/adolc/adolc-2.3.0-r1.ebuild b/sci-libs/adolc/adolc-2.4.1.ebuild
index 85ecaef470ee..b20d267a32ac 100644
--- a/sci-libs/adolc/adolc-2.3.0-r1.ebuild
+++ b/sci-libs/adolc/adolc-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/adolc-2.3.0-r1.ebuild,v 1.1 2012/07/19 20:18:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/adolc-2.4.1.ebuild,v 1.1 2013/05/26 15:55:01 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=yes
 AUTOTOOLS_IN_SOURCE_BUILD=yes
@@ -24,12 +24,12 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}-${PV}"
 
-PATCHES=( "${FILESDIR}"/${P}-{libdir,no-colpack}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.4.0-no-colpack.patch )
 
 src_configure() {
-	 local myeconfargs+=(
+	 local myeconfargs=(
 		 $(use_enable sparse)
-		 $(use sparse colpack "${EPREFIX}"/usr)
+		 $(use_with sparse colpack "${EPREFIX}"/usr)
 	 )
 	 autotools-utils_src_configure
 }
diff --git a/sci-libs/adolc/files/adolc-2.3.0-libdir.patch b/sci-libs/adolc/files/adolc-2.3.0-libdir.patch
deleted file mode 100644
index 94ab377245c4..000000000000
--- a/sci-libs/adolc/files/adolc-2.3.0-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Do not force libdir even on 64bits
-
---- configure.ac.orig	2012-07-19 12:52:25.402650941 -0700
-+++ configure.ac	2012-07-19 12:56:09.805832945 -0700
-@@ -50,9 +50,7 @@
- else
-    _lib=lib
- fi
--libdir='${prefix}/${_lib}'
- AC_SUBST(_lib)
--AC_SUBST(libdir)
- 
- # checks for header files
- AC_HEADER_STDC
diff --git a/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch
deleted file mode 100644
index 3708d911ce78..000000000000
--- a/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-do not test colpack when user says no even when it is installed
-
---- configure.ac.orig	2012-07-19 13:04:37.426461811 -0700
-+++ configure.ac	2012-07-19 13:06:06.477916144 -0700
-@@ -177,7 +177,7 @@
- COLPACK_LIBDIR=""
- COLPACK_LIBS="-lColPack"
- ])
--
-+if x$colpack != xno; then
- AC_LANG_PUSH([C++])
- save_CPPFLAGS="$CPPFLAGS"
- save_LIBS="$LIBS"
-@@ -198,7 +198,9 @@
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- AC_LANG_POP([C++])
--
-+else
-+    have_colpack=no
-+fi
- AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
- if test x$have_colpack = xyes; then 
-    sparse=yes