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

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 x86_64

5 files changed, 43 insertions, 11 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/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 6a4a5c532997..41f67212284f 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,6 +1,17 @@
-AUX ocaml-sqlite3-0.22.0-destdir.patch 581 RMD160 06d5d7bbb8fad3e77145a4857540fe244ff115a0 SHA1 63ee23fffe40aa8ffe5dcf7a7e6f9a00f83e4e0d SHA256 868795cc01eb64a135637900ed0edd965b3528b95660f0005f475f27d19da580
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ocaml-sqlite3-0.22.0-destdir.patch 606 RMD160 5d5a119f8079536fbe9aae1c143d2c35203552ae SHA1 f0a7fe28dfba9c9659dc39610e7a4e0893fca336 SHA256 167a3c4ed508b2e3d0e9d79a33c23d2b4cace3ce3793ea9d5d461a9c291ea3fa
 AUX ocaml-sqlite3-0.23.0-noocamlopt.patch 762 RMD160 9c7377173caba3ec6b2692728163a5779c2a5a10 SHA1 2876e7a37a0179acd51d6bf6f4407ee608c68160 SHA256 d6e6aa74c11bf06c9a38333f5c7aa676ccc4cbe2867ecab68edc38ce30793366
+AUX ocaml-sqlite3-1.2.0-werror.patch 416 RMD160 b0831045718a89fb385313f1b68a919ce7effa1a SHA1 8a9cf78cb67e63699a55eb87ed1797c97f3f115c SHA256 fd0e1da1ba6460bc34d19cdc46fe76e72f5049758531fd4c7297cfc215d865ff
 DIST ocaml-sqlite3-1.2.0.tar.bz2 47143 RMD160 0d6d83c394aaa265d2b7fadcf4a4b6351d4be5ec SHA1 b420e3a2969224b6c189e46b43676db053807924 SHA256 cd0fc0fb3b7838ab71483a066add6c20bb06baf8b141a8bdef11159110e28d2a
-EBUILD ocaml-sqlite3-1.2.0.ebuild 1516 RMD160 dd9ae561dba51997ba65050a2f453674cc741c94 SHA1 f08964468b9245bc33e61da064029a070179818a SHA256 f4e1e58ad77da845f270b85c26727e68dfbfc41169e3cd1cd4aeef04bbfb6835
-MISC ChangeLog 1538 RMD160 d5856624087fc74a0d3a4c0853f9a1cc5097c19e SHA1 ead3644ece5cae5ad98a9a2e869fc6ae2a3aa656 SHA256 7569793eac82503edd69676ca24ce6fc92c3679bab641e4180089cc2d2f3fcd8
+EBUILD ocaml-sqlite3-1.2.0.ebuild 1575 RMD160 c58de1c4eba9a61972585f0b6103a8811ed7d262 SHA1 cf2dcaaaeaca39d29d7c4e0b333a7ecff73652d7 SHA256 ffa41e3a1f96569568f7398cb4004cd4206deca61b949b9318265475c41b778c
+MISC ChangeLog 1794 RMD160 a0ed55d9ad5b2b7bab5b6890036fba98b6bb5873 SHA1 0d961ebab6e1f258a8ecd59dd076a62c07e590be SHA256 70fcedf17bce2a8a5cfc169344705833b368914cd2bafa7cf075f0bedc5448da
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjbhaUACgkQvFcC4BYPU0ou4QCgul3dAoPgzTTc4TsI2MIgr8Q8
+HxMAni0qMvdCgCtDv/eEpUDDZqaIAzo3
+=RvTd
+-----END PGP SIGNATURE-----
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() {