[gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/

["Jonathan-Christofer Demay" <jcdemay@gmail.com>]

commit:     62d7366e2c2d29d29a1189ee047addc5f35e7ad0
Author:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Wed May 11 23:50:24 2011 +0000
Commit:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Wed May 11 23:50:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=62d7366e

sci-mathematics/frama-c: version bump

---
 sci-mathematics/frama-c/ChangeLog                  |    6 +-
 .../files/frama-c-20100401-plugin_install.patch    |   33 ---------
 sci-mathematics/frama-c/frama-c-20100401.ebuild    |   71 --------------------
 ...101202_beta2.ebuild => frama-c-20110201.ebuild} |   29 +++-----
 4 files changed, 14 insertions(+), 125 deletions(-)

diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index 405dba0..ef202c5 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -2,9 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  07 Mar 2011; Justin Lecher <jlec@gentoo.org> frama-c-20100401.ebuild,
-  frama-c-20101202_beta2.ebuild:
-  Correct Slots for gtk 3 introduction to tree
+  06 may 2011; J.-C. Demay <jcdemay@gmail.com>
+  +frama-c-20110201.ebuild, -frama-c-20101202_beta2.ebuild:
+  version bump
 
   14 Feb 2011; J.-C. Demay <jcdemay@gmail.com>
   +frama-c-20101202_beta2.ebuild, -frama-c-20100401.ebuild, -files/frama-c-20100401-plugin_install.patch:

diff --git a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
deleted file mode 100644
index c5463cc..0000000
--- a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naurp frama-c-Boron-20100401/share/Makefile.dynamic frama-c-Boron-20100401b/share/Makefile.dynamic
---- frama-c-Boron-20100401/share/Makefile.dynamic	2010-04-13 11:52:53.000000000 +0000
-+++ frama-c-Boron-20100401/share/Makefile.dynamic	2010-07-04 19:48:52.000000000 +0000
-@@ -113,7 +113,7 @@ endif #FRAMAC_MAKE
- 
- PLUGIN_LIB_DIR	?= $(PLUGIN_DIR)
- PLUGIN_GUI_LIB_DIR ?= $(PLUGIN_DIR)/gui
--PLUGIN_INSTALL_DIR ?=$(FRAMAC_PLUGINDIR)
-+PLUGIN_INSTALL_DIR ?=$(DESTDIR)$(FRAMAC_PLUGINDIR)
- 
- PLUGIN_FLAGS:=$(FLAGS) $(DEBUG) $(FRAMAC_INCLUDES) -I $(FRAMAC_LIBDIR)
- PLUGIN_BFLAGS:=$(PLUGIN_FLAGS) $(PLUGIN_BFLAGS)
-@@ -182,6 +182,7 @@ endif
- ifneq ($(PLUGIN_ENABLE),no)
- install::
- 	$(PRINT_CP) $(PLUGIN_INSTALL_DIR)
-+	$(MKDIR) $(PLUGIN_INSTALL_DIR)
- 	$(CP) $(TARGETS) $(PLUGIN_INSTALL_DIR)
- 	$(PRINT_CP) $(BINDIR)
- 	if [ -f frama-c-$(PLUGIN_NAME).byte$(EXE) ]; then \
-@@ -191,9 +192,9 @@ install::
- 	  $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
- 		$(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
- 	fi
--	$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
--	echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
--	  >> $(FRAMAC_SHARE)/known_plugins.ac
-+	#$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
-+	#echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
-+	#  >> $(FRAMAC_SHARE)/known_plugins.ac
- ifeq ($(HAS_GUI),yes)
- 	$(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
- 	$(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui

diff --git a/sci-mathematics/frama-c/frama-c-20100401.ebuild b/sci-mathematics/frama-c/frama-c-20100401.ebuild
deleted file mode 100644
index 52ecf12..0000000
--- a/sci-mathematics/frama-c/frama-c-20100401.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools eutils
-
-NAME="Boron"
-
-DESCRIPTION="Suite for analysis of the source code in C"
-HOMEPAGE="http://frama-c.com"
-SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apron doc gtk +ocamlopt +why"
-
-RESTRICT="strip"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]
-	>=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
-	sci-mathematics/ltl2ba
-	apron? ( sci-mathematics/apron )
-	gtk? (
-		x11-libs/gtksourceview:2.0
-		>=gnome-base/libgnomecanvas-2.26
-		>=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?]
-		)"
-RDEPEND="${DEPEND}"
-PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
-
-S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
-
-src_prepare(){
-	rm share/libc/test.c
-	rm -Rf src/wp
-
-	epatch "${FILESDIR}/${P}-plugin_install.patch"
-
-	touch config_file
-	eautoreconf
-}
-
-src_configure() {
-	if use gtk; then
-		myconf="--enable-gui"
-	else
-		myconf="--disable-gui"
-	fi
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	# dependencies can not be processed in parallel,
-	# this is the intended behavior.
-	emake -j1 depend || die "emake depend failed"
-	emake all top DESTDIR="/" || die "emake failed"
-}
-
-src_install(){
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc Changelog doc/README
-
-	if use doc; then
-		dodoc doc/manuals/*
-	fi
-}

diff --git a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild b/sci-mathematics/frama-c/frama-c-20110201.ebuild
similarity index 70%
rename from sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
rename to sci-mathematics/frama-c/frama-c-20110201.ebuild
index 8f89398..2822e90 100644
--- a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20110201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,29 +6,24 @@ EAPI="3"
 
 inherit autotools eutils
 
-NAME="Carbon"
-
-DESCRIPTION="Suite for analysis of the source code in C"
+DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
 HOMEPAGE="http://frama-c.com"
+NAME="Carbon"
 SRC_URI="http://frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="apron doc gtk +ocamlopt +why"
-
 RESTRICT="strip"
 
-DEPEND="
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]
-	>=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
-	sci-mathematics/ltl2ba
-	apron? ( sci-mathematics/apron )
-	gtk? (
-		x11-libs/gtksourceview:2.0
-		>=gnome-base/libgnomecanvas-2.26
-		>=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?]
-		)"
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+		>=dev-ml/ocamlgraph-1.6[gtk?,ocamlopt?]
+		gtk? ( >=x11-libs/gtksourceview-2.8
+			>=gnome-base/libgnomecanvas-2.26
+			>=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?] )
+		sci-mathematics/ltl2ba
+		apron? ( sci-mathematics/apron )"
 RDEPEND="${DEPEND}"
 PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
 
@@ -44,8 +39,6 @@ src_prepare(){
 	mv doc/manuals doc/pdf
 
 	touch config_file
-	sed -i configure.in \
-		-e "s:1.7):1.6):g"
 	eautoreconf
 }