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

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

commit:     65a9a83e4f56155ad43c1c5bddff54a970ffd437
Author:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Mon Feb 14 02:36:10 2011 +0000
Commit:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Mon Feb 14 02:36:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=65a9a83e

sci-mathematics/frama-c: version bump

---
 sci-mathematics/frama-c/ChangeLog                  |    8 +++-
 .../files/frama-c-20100401-plugin_install.patch    |   33 --------------------
 ...a-c-20100401.ebuild => frama-c-20110201.ebuild} |   10 +++---
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index 89dc599..4e7e9d7 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -1,14 +1,18 @@
 # ChangeLog for sci-mathematics/frama-c
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Feb 2011; J.-C. Demay <jcdemay@gmail.com>
+  +frama-c-20110201.ebuild, -frama-c-20100401.ebuild, -files/frama-c-20100401-plugin_install.patch:
+  version bump
+
   11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   frama-c-20100401.ebuild:
   Dropped ~sparc since dependencies cannot be fulfilled.
 
   08 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
   frama-c-20100401.ebuild:
-  Version bump
+  version bump
 
   22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   frama-c-20090901.ebuild, +metadata.xml:

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-20110201.ebuild
similarity index 87%
rename from sci-mathematics/frama-c/frama-c-20100401.ebuild
rename to sci-mathematics/frama-c/frama-c-20110201.ebuild
index a7b59ec..b23e53e 100644
--- a/sci-mathematics/frama-c/frama-c-20100401.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20110201.ebuild
@@ -7,9 +7,9 @@ EAPI="3"
 inherit autotools eutils
 
 DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
-HOMEPAGE="http://www.frama-c.cea.fr/"
-NAME="Boron"
-SRC_URI="http://www.frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
+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"
@@ -30,13 +30,13 @@ PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
 S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
 
 src_prepare(){
-	epatch "${FILESDIR}/${P}-plugin_install.patch"
+	#epatch "${FILESDIR}/${P}-plugin_install.patch"
 
 	rm share/libc/test.c
 	
 	touch config_file
 	sed -i configure.in \
-		-e "s:1.4):1.5):g"
+		-e "s:1.7):1.6):g"
 	eautoreconf
 }