Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

3 files changed, 5 insertions, 150 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index f385a6945618..808e3e7dd64a 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.223 2015/05/25 04:40:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.224 2015/05/25 12:15:51 mrueg Exp $
+
+  25 May 2015; Manuel Rüger <mrueg@gentoo.org> -ocaml-3.11.2.ebuild:
+  Remove old.
 
   25 May 2015; Jeroen Roovers <jer@gentoo.org> ocaml-3.12.1.ebuild:
   Stable for PPC64 (bug #361767).
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index bbee552ba797..c19062239e9e 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,27 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch 2223 SHA256 612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e SHA512 75d3354d8d45150b5317cedf97051353f3f035f2b5dae3b30cc69e49f07d3989df8c585f3124777bdb4578a90eb2b1a58f696c019c42e199fb9084cb82d945c6 WHIRLPOOL 4e3d5be6c84b08711e9f9a17f6de8ddcba59faf0e44622b8fb5c9ff83b887c67d7c416847cf12d43338523d4e19c6288a420174927d3fbabb17233f89afc1d64
 AUX ocaml-4.01.0-pkg-config-ncurses.patch 675 SHA256 e8885d02a1e04086c3176a1c4b5c7e68521f5b39acffadeedc9359f4e0cf972b SHA512 b2f7c2a73857f70f4e02b5d8a981e09f85288b4e3b5c2f903a4f2b72486b554ae0202e26447e353782360ae498def81456a9919f4694a96a3218644e91ce6d53 WHIRLPOOL 6e42a67a36c2bf10dc7d0ff020ba73bf0ed2adfd8a040fd37fd4cf2acd3a88e06da06315ee04ec6e527214186da29cb3143ece3913d28538d907199fd70d45ce
 AUX ocaml-rebuild.sh 1120 SHA256 893320630726c58ea3b501ef16913c150c50ea9d6cd38ecd26fa0679597d3a7c SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40 WHIRLPOOL 11eec7641f2bced1593f21e3b4d9bc1d6156082e8e23d4abc2cfd05294dccd13a9bf5c102b60c0dcca0b565f6edbf8e7364d3236d57db18dcdd520fe05d379a6
 AUX ocaml.conf 177 SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1 SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 WHIRLPOOL d25c9ac2a565a5384c7f645be433faac192e4c41f55a08d74e99ec022ce06132a560070bb4771b261c6f023d3aec72fddb47279d5ab2cfe8cc93c70c97ff16d5
-DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143 SHA512 69888797bdab8f7baa5e398db08a723388876ed5920b62e9bf29a5214badde1c2024365f88bcbd89d43a0c8d9e4d1bd15486e4b12e8432f1c1bcedd17782faaf WHIRLPOOL d1e6d0851f8f1315f95cd0a470bb61dc1d39ec70f2ec23169ffc9aa74b2d02f5419e3474093319cb47125e7534a0d121751fd1971653e43bdca167f823d4c94a
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.01.0.tar.bz2 3691090 SHA256 b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a SHA512 b0a4efa89d0e48e5c01922156a73a8ed67c58efa07170710eaef9de1138e1d6fff8a440b2c81860fc63c604f3a4e189b795bb08a5e9d8df60778fcd468985f6e WHIRLPOOL a31cc2c46e19ca1c5ca65ffdee77ef42b7269b1584f81629e29b725b167c7e3d9eb467a3e8171aaba7d2cf1d8aea31d1822c5631fe3e209ce7731c16112a11d3
 DIST ocaml-4.02.1.tar.xz 2031244 SHA256 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc SHA512 79d257210c0ddfb0367250a688ffb58f143fcc8c159f7d6e149d42b074e811eaf69449b66ad39da399e1bdcb2bab5924d195fc7c5ebc29d44cb637c093b9931d WHIRLPOOL 2c9849f73a705a63c0d0d4682d1ab1225a3150f68bda98805dc2d2b11f100ee7206200b9dc49b07d39d1b737f45671f3662a9bf2c069d6795f26e1f9b9b65ead
-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-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c837c2ba0abc1487de10627e5e07 SHA512 88afa904044192b945b537cbfc3c17308e333ed1d241332212b9500d01c14bb306905b03f2b48ec64dd2f428df1f7179772d742b77b4402da108ba7790239bf6 WHIRLPOOL d2001a8a3e799080c3981be87bcef62635c11cab037d6d92da186643614c6e2a568543f82f3566bfb099c063ad344cab2238edf863a9fb02081f4e20f442d9f8
-EBUILD ocaml-3.11.2.ebuild 4355 SHA256 64d0669832969b53640d97711006b1e2588d806cd73224dd6ff4764a886c7df3 SHA512 455c07ab33faf9e2f799eb049b42e08d6432b83e196cd451b426eb259b017e9448f45ac6d7558661b472af856b17bdc60f82b9408ae8c6545f459c4f723c5083 WHIRLPOOL 783ef6567feaca8839330dab8878903cf5a5b89a1cf611fb3b80431e4b0488271c01ee2a053eb51a37735e11a1e72ec1e02aea3ab9b03cb9f24599fb0e91ad90
 EBUILD ocaml-3.12.1.ebuild 4134 SHA256 6053f4077d0f9fe336a1db36d3b43924ba4205ae27053d322c360c7d89f414e2 SHA512 189f535bbf2ba73a97bb73af8a9bb31ce3a0d3054b4e8779786c5b8b0eb172b669d7278d46270fefe1eb2ef21e69b445618a617593a99e9a9ea371cb02920c15 WHIRLPOOL f3b55e6e76902db677420894ac9d08a6bc1ccba1971970cd3b7213f5a2b895199d3fc08cc607ae18e40b15e8003237cdb8908a16f21c5acb2b242dcf84bd3995
 EBUILD ocaml-4.01.0.ebuild 3860 SHA256 466f5c7bc692d21cc7bb5ac634d301f6ff083887684f62c8b9a60ff73d93f7f3 SHA512 316ead5fa078932014a3a8f2f4f3d69c737ab87fdea7becf4b174024528faf59c904c5b8dc9c0ea2158fefd46a7ff481dfbc3f0e1b04f65424577227053e9deb WHIRLPOOL df3665b5296287cac79be659421f4799af41edcee459d383a5a9fbf046cf896273032c1e00aea5e4a82cedb63a73452cccc20efb64333c2d98326d3b5bcaefb1
 EBUILD ocaml-4.02.1.ebuild 3342 SHA256 76b9f20593881f58d6e2368341a7f092801f5398eaaf8c4d14a33a5453d4f7b4 SHA512 a74f7b3df74f173038d4d7f1e1cf4a6f1aef2681dfc673a9ff958f7e9e98c5e7a22832af394595e6d7c53ce8dac0ad37982878c7b3b7bb55ef4f9edccbe09b4b WHIRLPOOL 2acf914f99b011ba6085d4ddcedce8b358d526e8572ef1b7aa2985079360263c770b236a8d62abee35a23a9bd4da0a2b28f7812e4e2bce4a08e1ad1074c22743
-MISC ChangeLog 34860 SHA256 96d44d3094820c6749fd3bc998dc0dfd7fddfb11350c9a26fc2e6099c5f89784 SHA512 d2baa6cf745799ee875e5d2809041c19f6c80d89ddbc221d9cbd120405c70032e7a287145070a7c07e4daabffc9937492136f2daae66839b4c0a347495016c6b WHIRLPOOL 48c4385802f9a7d0488247a8af8620fe7bc96d80fb9ef1d743b7b4f299b4e4822231aabab4210b8659264d67186e84864e18aac56b9d252b5cd494e678f09aa3
+MISC ChangeLog 34947 SHA256 f03439efd1b8bbf4c545a3f8a9e0f65104a69de0ade0bb94b6099fcda939a44f SHA512 212e7e9747539fe0f8431855c22c0f5ab2b27ba0c809481e8bd33d7ee91b0d8d506800a341a12c5d215c9b0b34515ce05e1ed0799e906e0f42e874d50951e713 WHIRLPOOL 41049f878ad861fb1e9b1953aee4ac018a1c32e39ef957b9f87921c5af6c1360f0b0e76d09b5d0c5f44db55781b27aef1c970bfc47051db7e55e084a9e4c1370
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlVip7QACgkQVWmRsqeSphOv1gCfeUv1erd5d7L1vvT/UL5KOQU/
-QskAn0XmMOq/p3PpkNtQxmMqB4le+9t2
-=XnFq
------END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.11.2.ebuild b/dev-lang/ocaml/ocaml-3.11.2.ebuild
deleted file mode 100644
index be4f08812d90..000000000000
--- a/dev-lang/ocaml/ocaml-3.11.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2.ebuild,v 1.9 2014/01/18 13:12:48 gienah Exp $
-
-EAPI="1"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="1"
-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"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
-
-RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )
-	gdbm? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	# Bug #459512
-	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
-	# Upstream bug: http://caml.inria.fr/mantis/view.php?id=5237
-	epatch "${FILESDIR}/${PN}-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"
-}
-
-src_compile() {
-	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"
-	# Fails to build on arm if >O0 is used
-	use arm && replace-flags "-O?" -O0
-
-	use tk || myconf="${myconf} -no-tk"
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use gdbm || myconf="${myconf} -no-dbm"
-
-	# 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!"
-
-	emake -j1 world || die "make world failed!"
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake -j1 opt || die "make opt failed!"
-		emake -j1 opt.opt || die "make opt.opt failed!"
-	fi
-}
-
-src_install() {
-	make BINDIR="${D}"/usr/bin \
-		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${D}"/usr/share/man \
-		install || die "make install failed!"
-
-	# Install the compiler libs
-	dodir /usr/$(get_libdir)/ocaml/compiler-libs
-	insinto /usr/$(get_libdir)/ocaml/compiler-libs
-	doins {utils,typing,parsing}/*.{mli,cmi,cmo}
-	use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o}
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
-
-	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
-	dodoc Changes INSTALL README Upgrading
-
-	# Create and envd entry for latex input files (this definitely belongs into
-	# CONTENT and not in pkg_postinst.
-	if use latex ; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR
-	dosbin "${FILESDIR}/ocaml-rebuild.sh"
-}
-
-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:"
-	ewarn "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]"
-	ewarn "Which will call emerge on all old packages with the given options"
-	echo
-}