Dont use -Werror -pedantic when building, dont use install -D, keyword ~x86-fbsd

(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 x86_64)

4 files changed, 29 insertions, 8 deletions

diff --git a/dev-ml/ocaml-sqlite3/ChangeLog b/dev-ml/ocaml-sqlite3/ChangeLog
index dcdaeb9cafd2..03dcf929127d 100644
--- a/dev-ml/ocaml-sqlite3/ChangeLog
+++ b/dev-ml/ocaml-sqlite3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocaml-sqlite3
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ChangeLog,v 1.9 2008/07/13 06:55:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ChangeLog,v 1.10 2008/09/25 12:35:43 aballier Exp $
+
+  25 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  files/ocaml-sqlite3-0.22.0-destdir.patch,
+  +files/ocaml-sqlite3-1.2.0-werror.patch, ocaml-sqlite3-1.2.0.ebuild:
+  Dont use -Werror -pedantic when building, dont use install -D, keyword
+  ~x86-fbsd
 
   13 Jul 2008; Joseph Jezak <josejx@gentoo.org> ocaml-sqlite3-1.2.0.ebuild:
   Marked ~ppc for bug #197363.
diff --git a/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.22.0-destdir.patch b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.22.0-destdir.patch
index 19bd30f627e6..2b6d81e74b37 100644
--- a/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.22.0-destdir.patch
+++ b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.22.0-destdir.patch
@@ -1,13 +1,14 @@
-Index: ocaml-sqlite3-0.22.0/Makefile.in
+Index: ocaml-sqlite3-1.2.0/Makefile.in
 ===================================================================
---- ocaml-sqlite3-0.22.0.orig/Makefile.in
-+++ ocaml-sqlite3-0.22.0/Makefile.in
-@@ -37,7 +37,7 @@ install: sqlite3.cma sqlite3.cmxa sqlite
+--- ocaml-sqlite3-1.2.0.orig/Makefile.in
++++ ocaml-sqlite3-1.2.0/Makefile.in
+@@ -37,7 +37,8 @@ install: sqlite3.cma sqlite3.cmxa sqlite
  	[ -f *.so ] && SO_FILES=*.so; \
  	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES
  	ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma
 -	$(INSTALL) sqlite3top $(bindir)/sqlite3top
-+	$(INSTALL) -D sqlite3top $(DESTDIR)$(bindir)/sqlite3top
++	mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL) sqlite3top $(DESTDIR)$(bindir)/sqlite3top
  
  remove: uninstall
  uninstall:
diff --git a/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-1.2.0-werror.patch b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-1.2.0-werror.patch
new file mode 100644
index 000000000000..3f863014d9b4
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-1.2.0-werror.patch
@@ -0,0 +1,13 @@
+Index: ocaml-sqlite3-1.2.0/Makefile.in
+===================================================================
+--- ocaml-sqlite3-1.2.0.orig/Makefile.in
++++ ocaml-sqlite3-1.2.0/Makefile.in
+@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ 
+ CC=@CC@
+-CFLAGS=@CPPFLAGS@ @CFLAGS@ -fPIC -Wall -pedantic -Werror -Wno-long-long
++CFLAGS=@CPPFLAGS@ @CFLAGS@ -fPIC -Wall -Wno-long-long
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild
index 659f4cfcb001..dc04c4bda3b9 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild,v 1.2 2008/07/13 06:55:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ocaml-sqlite3-1.2.0.ebuild,v 1.3 2008/09/25 12:35:43 aballier Exp $
 
 inherit findlib eutils
 
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 pkg_setup() {
 	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
@@ -35,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-0.22.0-destdir.patch"
 	epatch "${FILESDIR}/${PN}-0.23.0-noocamlopt.patch"
+	epatch "${FILESDIR}/${PN}-1.2.0-werror.patch"
 }
 
 src_compile() {