version bump

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 138 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index f3d5c2f75e49..a5d7c6b1d050 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.213 2013/06/19 03:19:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.214 2013/08/16 00:28:28 aballier Exp $
+
+*ocaml-4.01.0_beta1 (16 Aug 2013)
+
+  16 Aug 2013; Alexis Ballier <aballier@gentoo.org> +ocaml-4.01.0_beta1.ebuild:
+  version bump
 
   19 Jun 2013; Alexis Ballier <aballier@gentoo.org> ocaml-4.00.1-r1.ebuild:
   fix dosym warning, bug #470106
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index fc60e24b043d..99ce07824afe 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -7,21 +7,24 @@ DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e3336
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.00.0.tar.bz2 2760767 SHA256 ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7 SHA512 428632f8f54afee3bc512853689df5702cfa95140aa31d33a8ff752b669481050808cf36ec52262764d17c48b0a03d5e427151ecec2e899361853e5c258578ca WHIRLPOOL 0a6aa4c57b35a563539e4cacb0387c0fdb869f57fc8cccb37344299988f76c4de6ab08c478b22d0303d146a80e8352e8fb4f1156fb9372f1a7d75e2001e4c323
 DIST ocaml-4.00.1.tar.bz2 2762205 SHA256 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da WHIRLPOOL 3fdc090e1158ae72c91685aef62c751f897f4e3efcfbdc07e00d92e83351494fd126bdaca31039c1bf5dc4107072d978bb30e02c879caafc215dbc913f2d6ed1
+DIST ocaml-4.01.0+beta1.tar.bz2 2893750 SHA256 02de6d2da992020b18c39748036706bafa5e4eef909f423c2ae81f10656dcccf SHA512 57def3344f23d2059e05f8bcf4f2afbc739b73157c435bdaea373081285e78c0090f3f214803537ddb8b59fdd7e425044ad8739d91686391a90ce9ded012b002 WHIRLPOOL 3af21646500ad4e3254ca9e1f384e44c485344b96835d81fb467888fc49c878863a75cddabc663b307ea3d82d47fe150df14d694b7155aa5a819269ea397ce1b
 DIST ocaml-patches-1.tar.bz2 3108 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49 SHA512 36042cfec68ec06a172f07c7e8ac7904fccd0619a0d5ae2ffc6c87216be7450463fdbeeb9544e5df9d7d93ce9cd52b1502d4b74ee196a911c9f9273bc41d4396 WHIRLPOOL 2f04b3859295973b20bd83e718812f0ab1a993dc143523ebeab7b3d23cfda2bfe0f1eeb2ca1dc1393ae00192337e0cdc9d1472c5681fb719390d337a7d1ddc0e
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-4.tar.bz2 2429 SHA256 42e7120e8b682dfbef9e5f5cc95adfc67f0ca7289c067f67dc28562d3cca6cc5 SHA512 bf66dee09807775a705eb80a58c6f4f5394ccae8614e3eb9d3ed8633cd52d28648e5fb10200d00479a40a7c6a371f8345fed4e67932024ea7632cadb407e310e WHIRLPOOL 107b1301a3d1035e368fba749821ee9d53aa22c08d30b5dbb470eb77060bbc47a82ef54a5340e22b0d2874e7c52aa55161551e84a52510b85c27189d3ef47a46
 DIST ocaml-patches-5.tar.bz2 2517 SHA256 a41c731da9312b29a8ff9e3b457439872ac47507b031dcb24dd4153e7cf09925 SHA512 38c0072c85d8cc3fd44e9864340385997f59afd974b60ef24fc43f50a8d33616e94310b927b9519191aebf2870a38d35a17163576352c3fd4c42a63cff936966 WHIRLPOOL 13b21e134f9887ea294fddad9ca4c18d48fcefe11b07bc7bd0dd2de232e4ff1f697db74fce62ff64e816910bbe49243ee20ac2a77f76827d28da4e0cdd221ae0
+DIST ocaml-patches-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c837c2ba0abc1487de10627e5e07 SHA512 88afa904044192b945b537cbfc3c17308e333ed1d241332212b9500d01c14bb306905b03f2b48ec64dd2f428df1f7179772d742b77b4402da108ba7790239bf6 WHIRLPOOL d2001a8a3e799080c3981be87bcef62635c11cab037d6d92da186643614c6e2a568543f82f3566bfb099c063ad344cab2238edf863a9fb02081f4e20f442d9f8
 EBUILD ocaml-3.11.2.ebuild 4127 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea SHA512 ac4a51bdf2e199635a2ab8fa18cab1907ef5f4357bc9695d23462d4cda4e836867a6de6c9d07f93522094ce764331d47528a6a46182fd3342a382dbae363da0c WHIRLPOOL 8b0d3bd3a359443dad4f4611af785cf857a2d3cbb8736f41fff28b7e86519036e7810fa3dbcba60fb07a4e79bb8148400b256b36a3390491151883ebb2c15132
 EBUILD ocaml-3.12.1.ebuild 4045 SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9 SHA512 3f6c6430eaac2020759134ea26012e2c657dd49f42fc54bbc6fff133639bdd78bfbe381d44b53281c9dd51d8a86eeaa25729b9766a12f45c2fd31a757df9ef94 WHIRLPOOL 1355f4ae0c98153efdfc95cd74a67383176d2141c5bef77cf41fd44b22901c3b5446d4aa0d7c83c7bd4d4a3fac564328a7a434051b523b64e827bd81db20d0d9
 EBUILD ocaml-4.00.0.ebuild 3982 SHA256 77df6c597358aa57ff5e8824ecfce494d1ef74df931506c21f9ba491d3afeb8e SHA512 e27a43c83c6241bdd18fb846580252dd448d19d8cc6c03bbe74e973c1416399ac7d08aa87187090e077bd6291649163fb6d2bdded632d92c34d495ad3b4441d5 WHIRLPOOL 76f2d6be1d4455f691bd43a10de531d064b89833a30351084d1fe28a2e0624769920fbcd8ef82f7f741f2c7ff28075e6b2bf14768f3002141835e4f26ef1e199
 EBUILD ocaml-4.00.1-r1.ebuild 3685 SHA256 47bb6f84d590209bfb35b91e8b34f8c82d34138b89829fa3a7e7b648178994d5 SHA512 477398d24c1e219e1de27cd5894925b89613048c714e68e6335dcc06b5c767bae07f53752dc1be0b054b2aa6666b64cb2356948a99e14627d12e47cbdfb03f43 WHIRLPOOL ffd0761225d487f64587d8ee581ad2b961f7cc933e1ddac92ea2604c72d7732164365503ba59dab21173b8a43052432df8e8136cac1d4482c12fb85fd2ac966d
 EBUILD ocaml-4.00.1.ebuild 3596 SHA256 f26e563e6efba0eaeb1b62ee0d0a72c54bc14085d69cacc5bb680203fb0c8746 SHA512 f700ba37ed0c3f978c867be55e326ae06679bd8bfbe2a32d9dadc89f8f7e3e2951c445700bc9534aee3b7ca593aec36a54e78ed700613736c56df03858729d6c WHIRLPOOL 3d0a59c0bbad95116ec56e86cfb9838a6c78dc22fa3a8a1e478f9fedf27dd878382106eda3b12c8c27af33b04b5c08c9d6280d146bab6d17c7d50a87a3169c83
-MISC ChangeLog 33049 SHA256 1c13076c2ca2a0bd40f3a2f4e7ca267a53fc98ae527461bd5f85f4179b1a2198 SHA512 1abbef8240900d237aec19de4e60fd9a247a7f60cc5feaace889850fa1e6871aff4856ad934eebfa78d431c8161b157183df7499c1dc7d67b4f94a92bae10c2c WHIRLPOOL 87cd96090608088e167b6753f4bab3c1e6740897fc1e37bc5ed450667f30966eea28fa06489e1b1758b15b2821a88ce71e8c5665da305ad121ecd3263c1b5fb0
+EBUILD ocaml-4.01.0_beta1.ebuild 3678 SHA256 a77af75d00a92d6fdab1b84070b29e1ab677f3b8e8320ad6400e5dfbd52834ff SHA512 58a8e2deb93030be842fe5012a6387045c98e44c154da3bb644879748e927a1122ea85ec45a746ceba1ab9f8188d1f069791e68f3f7ee130404991e46326003f WHIRLPOOL f127d9507b68935cf1f2dc276c11842d18b2ccddf393ec747c38be0eb221c8dd3854789233b5224c0d6f2a81de8dca70dc8a15db243794aee30869b9b11e667b
+MISC ChangeLog 33180 SHA256 c37e5962a01a706c30f8917d0f193f4927484de20c79454df0aa631245864c7b SHA512 ee2eb2775fd82e489ebf17a6cfb1e84f5a148e97fb13dd222fa7caca6bed3aea5f476baaf08db8b0a9af652e5b123b063f305da5d02f309b73d7cc69d2550a12 WHIRLPOOL a741e0a915efc50527a800cd4410953d2fb877593da178d071dbfc8ad874615549d9284988389552bfe1d182480343debe44bf94d43aaafd6dd89741a3537e15
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHBI14ACgkQvFcC4BYPU0rB6ACeKcuF633lm7x6ZtUDl1ZVSvpx
-nQIAn0JWDJw1ZBASNZu+D8HfMDf4ou4o
-=0VFi
+iEYEAREIAAYFAlINci0ACgkQvFcC4BYPU0p8BQCfSQLkRPT6hvJB2Bds5U44G51i
+FhAAn1zifti/ri+4od2IMTu+uv5fwIOW
+=EzSU
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.01.0_beta1.ebuild b/dev-lang/ocaml/ocaml-4.01.0_beta1.ebuild
new file mode 100644
index 000000000000..32d42e2db322
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.01.0_beta1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.01.0_beta1.ebuild,v 1.1 2013/08/16 00:28:28 aballier Exp $
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="6"
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
+
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+	ncurses? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+RDEPEND="${DEPEND}"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use tk || myconf="${myconf} -no-tk"
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
+		--bindir /usr/bin \
+		--libdir /usr/$(get_libdir)/ocaml \
+		--mandir /usr/share/man \
+		-host "${CHOST}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	# http://caml.inria.fr/mantis/view.php?id=4698
+	export CCLINKFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake -j1 world
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake -j1 opt
+		emake -j1 opt.opt
+	fi
+}
+
+src_install() {
+	make BINDIR="${D}"/usr/bin \
+		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${D}"/usr/share/man \
+		install
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
+
+	dodoc Changes INSTALL README
+
+	# Create and envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
+
+pkg_postinst() {
+	echo
+	ewarn "OCaml is not binary compatible from version to version, so you"
+	ewarn "need to rebuild all packages depending on it, that are actually"
+	ewarn "installed on your system. To do so, you can run:"
+	if has_version '>=sys-apps/portage-2.2' ; then
+		ewarn "emerge @ocaml-rebuild"
+	else
+		ewarn "emerge -1 /usr/$(get_libdir)/ocaml"
+	fi
+	echo
+}