From: Alexis Ballier Date: Sun, 9 Mar 2008 11:58:48 +0000 (+0000) Subject: remove unused versions X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=51124b927f6bc403b71e0610afcb8aac518b22dc;p=gentoo.git remove unused versions Package-Manager: portage-2.1.4.4 --- diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 37b3781efab3..acbbcca63477 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.138 2008/03/09 11:56:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.139 2008/03/09 11:58:48 aballier Exp $ + + 09 Mar 2008; Alexis Ballier -ocaml-3.09.3-r2.ebuild, + -ocaml-3.10.1.ebuild: + remove unused versions 09 Mar 2008; Alexis Ballier +files/ocaml-3.10.2-tk85.patch, ocaml-3.10.2.ebuild: diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 4a4a2e6a089d..6a2d490246ef 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -16,19 +16,16 @@ AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec AUX ocaml-rebuild.sh 1363 RMD160 8eda8892012f6600fb54be8ef3dd0594a649c81f SHA1 2790ddbed9cf897b7927264b7a86ad9f8f1b5965 SHA256 49e8ce024cdc2f665437c869d59931c136215971ec97d2c0b27d33668ebffa30 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f -DIST ocaml-3.10.1.tar.gz 2783352 RMD160 799798a3045ec8b026b923783301685445a5a733 SHA1 ba3a1848ca8bed5d25eb2934564a4a13050849f6 SHA256 ad4fb7c87942221bb3d7deab80cb1a104136eb62a29efc0b8233d1880f731977 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58 EBUILD ocaml-3.08.4.ebuild 2548 RMD160 b1f9ce0b2df4c8221e5c09e03ae8e7151100ad6c SHA1 193867386e022acdfcf6792353be23ee0f71d73d SHA256 78a55619ad7e4e2404a00e275abd4907d2873899ee3ef633b0d127e39a9b98e1 EBUILD ocaml-3.09.3-r1.ebuild 5527 RMD160 6f0f629b140dbe1b85f09e7a178ca73fee58fb4d SHA1 fd65f3e6048994cf76872cab7ee89b8b28a0251e SHA256 14e63cf0f62a5d916fc2ce3a04fa44fb1a98b8a806c3885f0c13d90ecb7eebc0 -EBUILD ocaml-3.09.3-r2.ebuild 5620 RMD160 0c851ed0b39423e36c8142620338dfc2a10fb05e SHA1 3667223a5f98109ba10d7b2429493964cb013d0f SHA256 fe645b9728880c28fdf5e61dd3043d12b3b1b015b01081c84929a32652db4969 -EBUILD ocaml-3.10.1.ebuild 4370 RMD160 60b6ed6e7ec9c159f788cdbcdf16bf6f52528c95 SHA1 b22152e4b429214446fc18827c412e2ea98fe86b SHA256 eebdb972fb7adb9db81399fe9dcdbc7603468d9b10eba7cb4cf5a24a60e502ff EBUILD ocaml-3.10.2.ebuild 4465 RMD160 8333ed26a1cf5441c417d0037db238b0cbac7f30 SHA1 a125b1eddb2c7ccb67718799b506a52cd79cdb96 SHA256 4a620ac885b67637f7a7fba1d4ce2afbfbd1e4f6e79be02c7dcf157c9366f41a -MISC ChangeLog 21910 RMD160 78cb360f739f1710a6fedc5a7530c19d459769cd SHA1 edc145aaaa55b9cb6c2fc55a75c9ff23fa85c135 SHA256 4811885e8adb0ed6481c24cf9655ac47387cb5fba49c385f0835b48e96bc4518 +MISC ChangeLog 22037 RMD160 85c822c1c7c5bc1f3884d428cfa5dac1be4fabbd SHA1 aec000d9d37c716007b41f8eedc76c1809f70f68 SHA256 8958b093ec35ace6f8c172ed3c2c9009ab17a69ea700fd06ad3785312ab030db MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH09BmvFcC4BYPU0oRAjgnAKDEwUJiKP7wgFeyUZ4cvv4KXm+KoQCdGjXp -EKJ0wjcaQK6rZTpaSC4kwws= -=8S/e +iD8DBQFH09D/vFcC4BYPU0oRAnGhAJ9Sr1YH9gNc+MS53xMgN3TI7OjR3QCgr8RP +Fcvms3nRp0jd2i33l1NJfI0= +=IxIo -----END PGP SIGNATURE----- diff --git a/dev-lang/ocaml/ocaml-3.09.3-r2.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r2.ebuild deleted file mode 100644 index 94b52cc3fa6f..000000000000 --- a/dev-lang/ocaml/ocaml-3.09.3-r2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r2.ebuild,v 1.2 2007/12/19 16:31:54 aballier Exp $ - -inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs - -DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family" -HOMEPAGE="http://www.ocaml.org/" -SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2 )/${P}.tar.bz2" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="emacs gdbm latex ncurses 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 )" - -PDEPEND="emacs? ( app-emacs/ocaml-mode ) - xemacs? ( app-xemacs/ocaml )" - -# ocaml deletes the *.opt files when running make bootstrap - -QA_EXECSTACK="/usr/lib/ocaml/compiler-*" - -pkg_setup() { - # dev-lang/ocaml fails with -fPIC errors due to a "relocation R_X86_64_32S" on AMD64/hardened - if use amd64 && gcc-specs-pie ; then - echo - eerror "${CATEGORY}/${PF} is currently broken on this platform with specfiles injecting -PIE." - eerror "Please switch to your \"${CHOST}-$(gcc-fullversion)-hardenednopie\" specfile via gcc-config!" - die "Current specfile (${CHOST}-$(gcc-fullversion)) not supported by ${PF}!" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix the EXEC_STACK in ocaml compiled binaries (#153382) - epatch "${FILESDIR}"/${P}-exec-stack-fixes.patch - - # Quick and somewhat dirty fix for bug #110541 - epatch "${FILESDIR}"/${P}-execheap.patch - - # The configure script doesn't inherit previous defined variables, - # overwriting previous declarations of bytecccompopts, bytecclinkopts, - # nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267. - epatch "${FILESDIR}"/${P}-configure.patch - - # The sed in the Makefile doesn't replace all occurences of @compiler@ - # in driver/ocamlcomp.sh.in. Reported upstream as issue 0004268. - epatch "${FILESDIR}"/${P}-Makefile.patch - - # ocaml has automagics on libX11 and gdbm - # http://caml.inria.fr/mantis/view.php?id=4278 - epatch "${FILESDIR}/${P}-automagic.patch" - - # Call ld with proper flags, different from gcc ones - # This happens when calling ocamlc -pack - # See comment in the patch - epatch "${FILESDIR}/${P}-call_ld_with_proper_flags.patch" - - # Ocaml native code generation for hppa has a bug - # See comments in the patch - # http://bugs.gentoo.org/show_bug.cgi?id=178256 - use hppa && epatch "${FILESDIR}/${P}-hppa-optimize-for-size-ocamlp4.patch" - - # Change the configure script to add the CFLAGS to bytecccompopts, LDFLAGS - # to bytecclinkopts. - sed -i -e "s,bytecccompopts=\"\",bytecccompopts=\"\${CFLAGS}\"," \ - -e "s,bytecclinkopts=\"\",bytecclinkopts=\"\${LDFLAGS}\"," \ - "${S}"/configure -} - -src_compile() { - local myconf="--host ${CHOST}" - - # dev-lang/ocaml tends to break/give unexpected results with "unsafe" CFLAGS. - strip-flags - replace-flags "-O?" -O2 - - # 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. - ./configure -prefix /usr \ - --bindir /usr/bin \ - --libdir /usr/$(get_libdir)/ocaml \ - --mandir /usr/share/man \ - --with-pthread ${myconf} || die "configure failed!" - - make world || die "make world failed!" - - # Native code generation is unsupported on some archs - if ! use ppc64 ; then - make opt || die "make opt failed!" - make 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,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 - - # Turn MPROTECT off for some of the ocaml binaries, since they are trying to - # rewrite the segment (which will obviously fail on systems having - # PAX_MPROTECT enabled). - pax-mark -m "${D}"/usr/bin/ocamldoc.opt "${D}"/usr/bin/ocamldep.opt \ - "${D}"/usr/bin/ocamllex.opt "${D}"/usr/bin/camlp4r.opt \ - "${D}"/usr/bin/camlp4o.opt - - # 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() { - if use amd64 && gcc-specs-ssp ; then - ewarn - ewarn "Make sure, you switch back to the default specfile ${CHOST}-$(gcc-fullversion) via gcc-config!" - ewarn - fi - - echo - elog "OCaml is not binary compatible from version to version, so you (may)" - elog "need to rebuild all packages depending on it, that are actually" - elog "installed on your system. To do so, you can run:" - elog "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]" - elog "Which will call emerge on all old packages with the given options" - echo -} diff --git a/dev-lang/ocaml/ocaml-3.10.1.ebuild b/dev-lang/ocaml/ocaml-3.10.1.ebuild deleted file mode 100644 index d99c1ca01a0f..000000000000 --- a/dev-lang/ocaml/ocaml-3.10.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.1.ebuild,v 1.1 2008/01/11 12:03:51 aballier Exp $ - -inherit flag-o-matic eutils multilib versionator toolchain-funcs - -EAPI="1" - -MY_P="${P/_rc/+rc}" -DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family" -HOMEPAGE="http://www.ocaml.org/" -SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~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 )" - -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}" - - # Fix the EXEC_STACK in ocaml compiled binaries (#153382) - epatch "${FILESDIR}"/${PN}-3.10.0-exec-stack-fixes.patch - - # The configure script doesn't inherit previous defined variables, - # overwriting previous declarations of bytecccompopts, bytecclinkopts, - # nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267. - epatch "${FILESDIR}"/${PN}-3.10.0-configure.patch - - # ocaml has automagics on libX11 and gdbm - # http://caml.inria.fr/mantis/view.php?id=4278 - epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch" - - # Call ld with proper flags, different from gcc ones - # This happens when calling ocamlc -pack - # See comment in the patch - epatch "${FILESDIR}/${PN}-3.10.0-call-ld-with-proper-ldflags.patch" - -} - -src_compile() { - local myconf="--host ${CHOST}" - - # dev-lang/ocaml tends to break/give unexpected results with "unsafe" CFLAGS. - strip-flags - replace-flags "-O?" -O2 - - # 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. - ./configure -prefix /usr \ - --bindir /usr/bin \ - --libdir /usr/$(get_libdir)/ocaml \ - --mandir /usr/share/man \ - --with-pthread ${myconf} || die "configure failed!" - - make world || die "make world failed!" - - # Native code generation can be disabled now - if use ocamlopt ; then - make opt || die "make opt failed!" - make 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,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 -}