remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 7fe2b351fc2f6e34ec9ba923e618f749a4696ed3..227ad7fd3f0bedab37c1dedae6fa30ff1e4bfffc 100644 (file)
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.175 2010/01/20 18:42:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.176 2010/04/12 06:34:10 aballier Exp $
+
+  12 Apr 2010; Alexis Ballier <aballier@gentoo.org> -ocaml-3.11.1.ebuild:
+  remove old
 
 *ocaml-3.11.2 (20 Jan 2010)
 

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 7efbd553a0179b338f206cfdd1f35b5ed48eb772..8b57173e1fdab6deb07e13da316ea92985631a72 100644 (file)
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -8,18 +8,16 @@ AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e2
 AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec SHA1 98c7a48c167500d3e7d8c34e79124dc0cedc315d SHA256 ba539578fbec539ff481b5fc786612d5e85b01cc2d6eee22a2f9ed340d2d0fd3
 AUX ocaml-rebuild.sh 1055 RMD160 a75f61820cfdc262912cc5af1241779bf900d4d7 SHA1 a673a51e05d6103863061109c4d5956ca6efdf2b SHA256 446aab21ab2d757d37666c28a634f5d0da5f690f2694354d77cdb73b202a37ae
 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
-DIST ocaml-3.11.1.tar.gz 2859411 RMD160 7a48021e80602917cc91f7cc3305d5f3ab92b0bc SHA1 05ccb525bb53f8676e238de31209713ec38ae63a SHA256 70bf4ec660b07c9119123eb8ef2a5d9e5e98fac8c4082cca33b2622e91386b53
 DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49
 EBUILD ocaml-3.10.2.ebuild 4519 RMD160 c74e33993f7220e03c05bd53b8561314fd2005d7 SHA1 6f0ed3f24d696e157593d0d10da8e90c6afa8dcf SHA256 877db782c1b7f868698aef2ac7ffafa3ef45c56ffd8f59c25fa83866f2de19d8
-EBUILD ocaml-3.11.1.ebuild 4014 RMD160 ad0f01489f02a87c676444f03aaa46326fc70158 SHA1 6d9d400f80fc9b3013a3c2544e5f7d9da5f6b82a SHA256 cf57c39869c312aac689afce98145a772d319e9ff4190ca01f9477a2455ffb93
 EBUILD ocaml-3.11.2.ebuild 4058 RMD160 82434893cb2736e86952c01ef62bdaab1d4bce45 SHA1 27ad3c4a085ed61ba03febabf95dee1c7a2772b6 SHA256 74471c6532eab2d22ec63733dd07e8b89934485cc7bd65e31440235fa4d57b00
-MISC ChangeLog 27762 RMD160 f1de54a020ffc5c0d42240a3b870c26d31bb3678 SHA1 427252e2123796728821261631dc20c67e75d37c SHA256 4389721fb7de8dda04aedc5c6ff49b9236fe7ae8dabb06827927cbe5eb88c120
+MISC ChangeLog 27850 RMD160 a593314a461f76458e9534c004255d3db90d5123 SHA1 eb38b472bd0d1de1bab3a7ba0a81544326a7105e SHA256 546ba173e88dccf052a98dbf18c6ce0b55c9d1d6ad8d0b408246615fb8e6a370
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktXTq4ACgkQvFcC4BYPU0r/gQCgtWBRKidjBBV/8KrSt9Fmm6Nz
-qo8An05/oFY26G4tYTHeZZktrIUfVPao
-=a+dc
+iEYEARECAAYFAkvCvugACgkQvFcC4BYPU0rsOwCfcwl7xukb4d3xi2v23n2xNUtG
+NYQAoMRLxUklgKquUYKmDhwGnIiNtc5C
+=jMIX
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ocaml/ocaml-3.11.1.ebuild b/dev-lang/ocaml/ocaml-3.11.1.ebuild
deleted file mode 100644 (file)
index 023663d..0000000
--- a/dev-lang/ocaml/ocaml-3.11.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v 1.7 2009/12/12 14:11:50 flameeyes 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/cristal/ocaml/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz
-       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"
-
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-       ncurses? ( sys-libs/ncurses )
-       X? ( x11-libs/libX11 x11-proto/xproto )
-       gdbm? ( sys-libs/gdbm )"
-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_unpack() {
-       unpack ${A}
-       cd "${S}"
-       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-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"
-
-       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" \
-               --with-pthread ${myconf} || die "configure failed!"
-
-       emake 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
-}