version bump

Package-Manager: portage-2.1.2.2

5 files changed, 130 insertions, 10 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 23efa350b1c1..657b304e29dc 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/findlib
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.22 2006/12/27 21:41:40 peper Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.23 2007/03/14 18:01:23 aballier Exp $
+
+*findlib-1.1.2_p1 (14 Mar 2007)
+
+  14 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/findlib-1.1.2_p1-sandbox.patch, +findlib-1.1.2_p1.ebuild:
+  Version bump
 
   27 Dec 2006; Piotr Jaroszyński <peper@gentoo.org>
   findlib-1.0.4-r1.ebuild:
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index a7c0529d9fbe..ca76a1319de9 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,15 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX findlib-1.1.2_p1-sandbox.patch 410 RMD160 9719f5e95970d49c918a701e33d198d7cef888e6 SHA1 508b5cd3084cadaae6aba5bc828001164e86dbeb SHA256 ddfe52d584fbb091e9b167593d30b59871489031b4df08b434c53f8d2ade0ab5
+MD5 59f0694220d1e7aa0c7aabe2b1756f8e files/findlib-1.1.2_p1-sandbox.patch 410
+RMD160 9719f5e95970d49c918a701e33d198d7cef888e6 files/findlib-1.1.2_p1-sandbox.patch 410
+SHA256 ddfe52d584fbb091e9b167593d30b59871489031b4df08b434c53f8d2ade0ab5 files/findlib-1.1.2_p1-sandbox.patch 410
 DIST findlib-1.0.4.tar.gz 148287 RMD160 71c2ce482666db5df5ad25d57ebb306bbe551e64 SHA1 405db790d3cb8b04bf6ede7444103ae678a90ef7 SHA256 dcd0970672b6893cb91ba8dafe56b5f9508b13277e2b68bad7596b9ec1b68516
+DIST findlib-1.1.2pl1.tar.gz 153542 RMD160 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3 SHA1 ccd8b9d6249b5a4097040d32b90048b11054f461 SHA256 091d8ddbf1dba0ae9fe35d1fac96211bdfafcc1ddc0d1c2981783e1bc3bf9c8f
 EBUILD findlib-1.0.4-r1.ebuild 1721 RMD160 50df3dede2315d49c20e6cefe2628ddae0418c38 SHA1 aab0273777577d76b1bb0dd9daa5516bcf16fdc4 SHA256 63447f61c8a5dd3549510f5b7c024ffd7a3c0813db1156822d7cad7572af83c1
 MD5 6064372460615ad5b7931982cee1ffae findlib-1.0.4-r1.ebuild 1721
 RMD160 50df3dede2315d49c20e6cefe2628ddae0418c38 findlib-1.0.4-r1.ebuild 1721
 SHA256 63447f61c8a5dd3549510f5b7c024ffd7a3c0813db1156822d7cad7572af83c1 findlib-1.0.4-r1.ebuild 1721
-MISC ChangeLog 2660 RMD160 41e53e4eefd69ea6e6c13229a694fb7d993b7b09 SHA1 a999f443afac8f3f4d8870244e63674f36c0f4b1 SHA256 6e8ce23c1fe4118ea3205b6f6c5c64f0b8b72a4d021f5545511fafbe4b450daf
-MD5 f0321f647ab72d798fa6edae00a272af ChangeLog 2660
-RMD160 41e53e4eefd69ea6e6c13229a694fb7d993b7b09 ChangeLog 2660
-SHA256 6e8ce23c1fe4118ea3205b6f6c5c64f0b8b72a4d021f5545511fafbe4b450daf ChangeLog 2660
+EBUILD findlib-1.1.2_p1.ebuild 1903 RMD160 a288e2e6cdf8e99eb3821c04e2f38eabfda56a70 SHA1 c6d6a9d6cae6ac4824a853673cdb7b730f31250c SHA256 e5e8a49d10412526bb49f1097c36ede140b8a1360ba16d1f3aaa75f2f3f72853
+MD5 e59baf74a1f57a360517c94e3e732e75 findlib-1.1.2_p1.ebuild 1903
+RMD160 a288e2e6cdf8e99eb3821c04e2f38eabfda56a70 findlib-1.1.2_p1.ebuild 1903
+SHA256 e5e8a49d10412526bb49f1097c36ede140b8a1360ba16d1f3aaa75f2f3f72853 findlib-1.1.2_p1.ebuild 1903
+MISC ChangeLog 2831 RMD160 c820115eba6a15fb09bb129bc64dcc587d50c37c SHA1 5ae6f3da20ba1f9210a8875d84470b13c8cb78e9 SHA256 a0e5fa1cc31b6ca243f96c3e4a209559546a61cf6c37a71ce3184467f5e0201c
+MD5 26a44ce242661d1aa2e2a4ce64db521f ChangeLog 2831
+RMD160 c820115eba6a15fb09bb129bc64dcc587d50c37c ChangeLog 2831
+SHA256 a0e5fa1cc31b6ca243f96c3e4a209559546a61cf6c37a71ce3184467f5e0201c ChangeLog 2831
 MISC metadata.xml 225 RMD160 138a4a018327b252bca64596a96ca8ba9889518e SHA1 1ac1e2169f829499fdbe256195de97ed63b5a7b1 SHA256 5c308b27332bed379ee06e522386288fa511e83e6449d834dea9ebcd8e827592
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 RMD160 138a4a018327b252bca64596a96ca8ba9889518e metadata.xml 225
@@ -17,10 +26,13 @@ SHA256 5c308b27332bed379ee06e522386288fa511e83e6449d834dea9ebcd8e827592 metadata
 MD5 6972fec5130aa3075bd395b9ec5a1d4c files/digest-findlib-1.0.4-r1 241
 RMD160 787f1c8e5392322623be2c519733374f188a4828 files/digest-findlib-1.0.4-r1 241
 SHA256 d23ca58c9530b2e2da03f337e74bb8b1264c456cc9c549c2f383ac0c4b08d7b2 files/digest-findlib-1.0.4-r1 241
+MD5 e2c275c367bc2b380311c01c976b8918 files/digest-findlib-1.1.2_p1 250
+RMD160 b23844e1c64cceaf075c0f1ad7c7af95a17d35d2 files/digest-findlib-1.1.2_p1 250
+SHA256 48f0e021b4f3acdb983ad246f5e0b6c9e5fb12f5d5e54df913bdb3a64f029f11 files/digest-findlib-1.1.2_p1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFkuidppoStNGKGywRAticAJ9bTq8Dc5p3lh/O8qRvc43U272SaQCfd2Ut
-OFUlXumIlEYtFSRfzlFJ2OA=
-=0808
+iD8DBQFF+DhdvFcC4BYPU0oRAhKVAKCdTgIX3Y43leqxFg7H0VDXp9wV9wCgv0Oh
+plcUkoT3cPQ6Wclt9gzSHo4=
+=XFJh
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/files/digest-findlib-1.1.2_p1 b/dev-ml/findlib/files/digest-findlib-1.1.2_p1
new file mode 100644
index 000000000000..c9acee98b300
--- /dev/null
+++ b/dev-ml/findlib/files/digest-findlib-1.1.2_p1
@@ -0,0 +1,3 @@
+MD5 df4c9176e9d5b8a6d37668d108fae923 findlib-1.1.2pl1.tar.gz 153542
+RMD160 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3 findlib-1.1.2pl1.tar.gz 153542
+SHA256 091d8ddbf1dba0ae9fe35d1fac96211bdfafcc1ddc0d1c2981783e1bc3bf9c8f findlib-1.1.2pl1.tar.gz 153542
diff --git a/dev-ml/findlib/files/findlib-1.1.2_p1-sandbox.patch b/dev-ml/findlib/files/findlib-1.1.2_p1-sandbox.patch
new file mode 100644
index 000000000000..f8b8c6f7bba9
--- /dev/null
+++ b/dev-ml/findlib/files/findlib-1.1.2_p1-sandbox.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.1.2pl1/Makefile
+===================================================================
+--- findlib-1.1.2pl1.orig/Makefile
++++ findlib-1.1.2pl1/Makefile
+@@ -22,7 +22,7 @@ install:
+ 	$(MAKE) install-meta
+ 	cd src/findlib; $(MAKE) install-num-top
+ 	$(MAKE) install-config
+-	cp tools/safe_camlp4 $(OCAMLFIND_BIN)
++	cp tools/safe_camlp4 $(prefix)$(OCAMLFIND_BIN)
+ 
+ uninstall:
+ 	$(MAKE) uninstall-doc
diff --git a/dev-ml/findlib/findlib-1.1.2_p1.ebuild b/dev-ml/findlib/findlib-1.1.2_p1.ebuild
new file mode 100644
index 000000000000..ebb532c8872c
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.1.2_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.1.2_p1.ebuild,v 1.1 2007/03/14 18:01:23 aballier Exp $
+
+inherit multilib eutils
+
+IUSE="doc tk"
+
+MY_P=${P/_p/pl}
+
+DESCRIPTION="OCaml tool to find/use non-standard packages."
+HOMEPAGE="http://www.ocaml-programming.de/packages/"
+SRC_URI="http://www.ocaml-programming.de/packages/${MY_P}.tar.gz"
+
+LICENSE="MIT X11"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/ocaml-3.07"
+
+ocamlfind_destdir="/usr/$(get_libdir)/ocaml/site-packages"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+pkg_setup()
+{
+	if ( use tk && ! built_with_use dev-lang/ocaml tk ); then
+		eerror "It seems you don't have ocaml compiled with tk support"
+		eerror ""
+		eerror "The findlib toolbox requires ocaml be built with tk support."
+		eerror ""
+		die "Please make sure that ocaml is installed with tk support or remove the USE flag"
+	fi
+}
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-sandbox.patch"
+
+}
+
+
+src_compile() {
+	./configure -bindir /usr/bin -mandir /usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf || die "configure failed"
+
+	emake all || die
+	emake opt || die # optimized code
+}
+
+src_install() {
+	dodir `ocamlc -where`
+
+	emake prefix="${D}" install || die
+
+	dodir "${stublibs}"
+
+	cd "${S}/doc"
+	dodoc QUICKSTART README DOCINFO
+	use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}