Add support to build without ocamlopt, install in findlib destdir, install binaries in /usr, dont strip non ocamlopt binaries, restrict installsources as debugedit has the same effect as stripping on ocamlc -custom binaries

Package-Manager: portage-2.1.4

3 files changed, 51 insertions, 17 deletions

diff --git a/dev-scheme/schoca/ChangeLog b/dev-scheme/schoca/ChangeLog
index 6911a1f13712..b6a712bf0c3f 100644
--- a/dev-scheme/schoca/ChangeLog
+++ b/dev-scheme/schoca/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/schoca
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/schoca/ChangeLog,v 1.1 2008/01/08 15:57:19 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/schoca/ChangeLog,v 1.2 2008/01/17 19:35:08 aballier Exp $
+
+  17 Jan 2008; Alexis Ballier <aballier@gentoo.org> schoca-0.3.0.ebuild:
+  Add support to build without ocamlopt, install in findlib destdir, install
+  binaries in /usr, dont strip non ocamlopt binaries, restrict installsources
+  as debugedit has the same effect as stripping on ocamlc -custom binaries
 
 *schoca-0.3.0 (08 Jan 2008)
 
diff --git a/dev-scheme/schoca/Manifest b/dev-scheme/schoca/Manifest
index 8aa3495807ce..ceb292ef0e5b 100644
--- a/dev-scheme/schoca/Manifest
+++ b/dev-scheme/schoca/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST schoca-0.3.0.tar.bz2 49738 RMD160 e900118731d94ebd735aa4108b28261fff03e948 SHA1 57374cd0e605ea12194cd90ce9e5c3be8a528f80 SHA256 5527a8bf07faa7e715626612735a044bf970480637d98eea612bf61bb7042511
-EBUILD schoca-0.3.0.ebuild 889 RMD160 b6287e85647d649b3f4b126fa6e65095312a8c57 SHA1 f000f15ba18e090b3844f0a6267e983daefc7c5d SHA256 03cfd147026c9d7d79b0b413975cf63e266051ad8043372715e128b42bee1e0b
-MD5 e64efd15f096d36048aaaba873a69033 schoca-0.3.0.ebuild 889
-RMD160 b6287e85647d649b3f4b126fa6e65095312a8c57 schoca-0.3.0.ebuild 889
-SHA256 03cfd147026c9d7d79b0b413975cf63e266051ad8043372715e128b42bee1e0b schoca-0.3.0.ebuild 889
-MISC ChangeLog 342 RMD160 1cd84b41c00aee0ba8e6854b22b4348ed9f11abc SHA1 8d4ae9c64aeb7c5e7c15b34d82a2541a8fa59a93 SHA256 922cbdf2ab06a688bea15fd40ca2b7a60cbf618d1e3cda49b47f283174ebcc09
-MD5 d1ab777e0a9d7e52575069d2a165b44e ChangeLog 342
-RMD160 1cd84b41c00aee0ba8e6854b22b4348ed9f11abc ChangeLog 342
-SHA256 922cbdf2ab06a688bea15fd40ca2b7a60cbf618d1e3cda49b47f283174ebcc09 ChangeLog 342
+EBUILD schoca-0.3.0.ebuild 1819 RMD160 455bf0018b232348fb0d4a47f231973c234e7539 SHA1 21f24ee3dc1c04317554698771a5514da157668d SHA256 63462dcf4d7efa493dd3fe3818facceddbc5090a982fd2943647b81f6bce4300
+MD5 d5931b35065ee9639667593aefa1d2a2 schoca-0.3.0.ebuild 1819
+RMD160 455bf0018b232348fb0d4a47f231973c234e7539 schoca-0.3.0.ebuild 1819
+SHA256 63462dcf4d7efa493dd3fe3818facceddbc5090a982fd2943647b81f6bce4300 schoca-0.3.0.ebuild 1819
+MISC ChangeLog 649 RMD160 be401d2b0e84928384f425c1953061abc6572954 SHA1 00372009e1c807e5ff82a7eb0ad1198eff303143 SHA256 b7a2a45538e6fb9ceecf9767170481b9ed587f2549329b59ef2fe5cccf503a86
+MD5 79eed38dfd9992428e13718e9cb29bee ChangeLog 649
+RMD160 be401d2b0e84928384f425c1953061abc6572954 ChangeLog 649
+SHA256 b7a2a45538e6fb9ceecf9767170481b9ed587f2549329b59ef2fe5cccf503a86 ChangeLog 649
 MISC metadata.xml 399 RMD160 17c5ed6283d55f70d27dea5cb05401ae627765d0 SHA1 af62fec14a9e69a3e3d0fb9a42af34e9405b36aa SHA256 2bbf2111d3d894d0a7dd521dc2f4513bd9465a82b2c62ec561d2c0c2ad74ca27
 MD5 a80da58ccaa84de441482bdf54cf7296 metadata.xml 399
 RMD160 17c5ed6283d55f70d27dea5cb05401ae627765d0 metadata.xml 399
@@ -14,3 +17,10 @@ SHA256 2bbf2111d3d894d0a7dd521dc2f4513bd9465a82b2c62ec561d2c0c2ad74ca27 metadata
 MD5 83799f210b3b7113fca61d37ba20c8f5 files/digest-schoca-0.3.0 238
 RMD160 fcbfd7d2803a281aa4d25be57d6da3134b8c9695 files/digest-schoca-0.3.0 238
 SHA256 ae7bbcde7ff9d3f3b85068618aa33366846ad1152f303023993c58df0d448c92 files/digest-schoca-0.3.0 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHj65yvFcC4BYPU0oRAsd4AJ9kHVjWeRdVgLgRwXfJrqkHdKCoeACgjSai
+9Ir8/erYAJ7v7DTxFoi5msk=
+=QENb
+-----END PGP SIGNATURE-----
diff --git a/dev-scheme/schoca/schoca-0.3.0.ebuild b/dev-scheme/schoca/schoca-0.3.0.ebuild
index b555afe4f196..97b2f0dc1241 100644
--- a/dev-scheme/schoca/schoca-0.3.0.ebuild
+++ b/dev-scheme/schoca/schoca-0.3.0.ebuild
@@ -1,6 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/schoca/schoca-0.3.0.ebuild,v 1.1 2008/01/08 15:57:19 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/schoca/schoca-0.3.0.ebuild,v 1.2 2008/01/17 19:35:08 aballier Exp $
+
+EAPI="1"
+
+inherit eutils
+
+RESTRICT="installsources"
 
 DESCRIPTION="Schoca is a Scheme implementation in OCaml."
 
@@ -8,24 +14,35 @@ HOMEPAGE="http://home.arcor.de/chr_bauer/schoca.html
 		  http://chesslib.sourceforge.net/"
 
 SRC_URI="mirror://sourceforge/chesslib/${P}.tar.bz2"
-
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~amd64"
-
-IUSE=""
+IUSE="+ocamlopt"
 
 DEPEND="dev-ml/findlib"
-
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}; cd "${S}"
 	cp OCaml.mk OCaml.mk.old
 	sed "s:\$(CFLAGS):\$(CCFLAGS):g" -i OCaml.mk
 	sed "s:CCFLAGS= -ccopt -O2:CCFLAGS= -ccopt \"${CFLAGS}\":" -i OCaml.mk
+	sed -i -e "s:DESTDURFLAG:DESTDIRFLAG:" OCaml.mk
+	if ! use ocamlopt; then
+		sed -i -e 's/ \$(PROGRAM)\.opt/ \$(PROGRAM)/' OCaml.mk || die "sed failed"
+		sed -i -e 's/ \$(LIBRARY)\.cmxa//' OCaml.mk || die "sed failed"
+		sed -i -e 's/ \$(LIBRARY)\.a//' OCaml.mk || die "sed failed"
+		sed -i -e 's/) \$(NCOBJECTS)/)/' OCaml.mk || die "sed failed"
+	fi
 	diff -u OCaml.mk.old OCaml.mk
 }
 
@@ -35,5 +52,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	use ocamlopt || export STRIP_MASK="*bin/schoca"
+	dodir "$(ocamlfind printconf destdir)"
+	emake PREFIX="/usr" DESTDIR="${D}" DESTDIRFLAG="-destdir ${D}$(ocamlfind printconf destdir)" install || die "emake install failed"
 }