version bump

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 9 insertions, 53 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index a50d8d4f49fc..76d7e50f2c71 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.258 2014/11/08 20:38:11 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.259 2014/12/28 23:34:41 ottxor Exp $
+
+*gnuplot-5.0_rc3 (28 Dec 2014)
+
+  28 Dec 2014; Christoph Junghans <ottxor@gentoo.org> +gnuplot-5.0_rc3.ebuild,
+  -files/gnuplot-5.0_rc1-libcerf.patch, -gnuplot-5.0_rc2.ebuild:
+  version bump
 
 *gnuplot-4.6.6 (08 Nov 2014)
 
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0_rc1-libcerf.patch b/sci-visualization/gnuplot/files/gnuplot-5.0_rc1-libcerf.patch
deleted file mode 100644
index e9e0139f8d72..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.0_rc1-libcerf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://sourceforge.net/p/gnuplot/feature-requests/399/
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/gnuplot/gnuplot/configure.in,v
-retrieving revision 1.370
-diff -u -r1.370 configure.in
---- configure.in	20 Jun 2014 22:58:46 -0000	1.370
-+++ configure.in	21 Jul 2014 23:33:43 -0000
-@@ -80,19 +80,25 @@
- AC_FUNC_FSEEKO
- AC_SYS_LARGEFILE
- 
--dnl The libcerf library contains a set of complex-valued special functions
--dnl related to the error function (cerf, erfi, Dawson's integral, Voigt profile).
--dnl If libcerf is installed then we can use them.
--PKG_CHECK_MODULES_NOFAIL([LIBCERF], [libcerf],
--    [
--    CPPFLAGS="$CPPFLAGS $LIBCERF_CFLAGS"
--    LDFLAGS="$LDFLAGS $LIBCERF_LIBS"
--    ],
--)
--AC_SEARCH_LIBS([cdawson], [cerf],
--    [AC_DEFINE([HAVE_LIBCERF], 1, [define if you have libcerf])
--    have_libcerf=yes]
--)
-+AC_ARG_WITH(libcerf,dnl
-+[  --without-libcerf      build without special functions from libcerf (default enabled)],,
-+  [test -z "${with_libcerf}" && with_libcerf=yes])
-+
-+if test "${with_libcerf}" = yes ; then
-+  dnl The libcerf library contains a set of complex-valued special functions
-+  dnl related to the error function (cerf, erfi, Dawson's integral, Voigt profile).
-+  dnl If libcerf is installed then we can use them.
-+  PKG_CHECK_MODULES_NOFAIL([LIBCERF], [libcerf],
-+      [
-+      CPPFLAGS="$CPPFLAGS $LIBCERF_CFLAGS"
-+      LDFLAGS="$LDFLAGS $LIBCERF_LIBS"
-+      ],
-+  )
-+  AC_SEARCH_LIBS([cdawson], [cerf],
-+      [AC_DEFINE([HAVE_LIBCERF], 1, [define if you have libcerf])
-+      have_libcerf=yes]
-+  )
-+fi
- 
- dnl Various programs
- dnl X/Emacs for building .texi version of docs
diff --git a/sci-visualization/gnuplot/gnuplot-5.0_rc2.ebuild b/sci-visualization/gnuplot/gnuplot-5.0_rc3.ebuild
index cc3329574070..82e31d344694 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0_rc2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-5.0_rc2.ebuild,v 1.1 2014/09/08 20:27:12 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-5.0_rc3.ebuild,v 1.1 2014/12/28 23:34:41 ottxor Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ -z ${PV%%*9999} ]]; then
 	inherit autotools cvs
 	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
 	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
+	ECVS_BRANCH="branch-5-0-stable"
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
@@ -75,9 +75,6 @@ src_prepare() {
 			emake -C "$dir" -f Makefile.am.in Makefile.am
 		done
 		eautoreconf
-	else
-		epatch "${FILESDIR}/${PN}-5.0_rc1-libcerf.patch"
-		eautoreconf
 	fi
 
 	# Add special version identification as required by provision 2