remove old

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

7 files changed, 6 insertions, 453 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index b24776ca7a7a..a41dff599ee9 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.79 2013/08/03 12:06:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.80 2013/08/19 14:13:13 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> -coq-8.3_p2.ebuild,
+  -coq-8.3_p3.ebuild, -coq-8.3_p4.ebuild, -coq-8.4.ebuild,
+  -files/coq-8.4-lablgtk216.patch, -files/lablgtk216.patch:
+  remove old
 
 *coq-8.4_p2 (03 Aug 2013)
 
diff --git a/sci-mathematics/coq/coq-8.3_p2.ebuild b/sci-mathematics/coq/coq-8.3_p2.ebuild
deleted file mode 100644
index 37dc9f4b8047..000000000000
--- a/sci-mathematics/coq/coq-8.3_p2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild,v 1.3 2012/03/24 13:59:39 gienah Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
-	>=dev-ml/camlp5-5.09[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# configure has an error at line 640 leading to closing a
-	# string to early in the generated coq_config.ml. Here is a
-	# wild sed which replaces \"$LABLGTKLIB\" by $LABLGTKLIB.  Note
-	# during pl2-bump: Hmm, my patch did not get applied upstream?
-	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
-	# Stdpp.Exc_located is an alias for Ploc.Exc, it has been
-	# deprecated for a while, and was removed in dev-ml/camlp5-6.05
-	# Fixed by upstream in svn repo:
-	# https://coq.inria.fr/bugs/show_bug.cgi?id=2728
-	sed -e 's@Stdpp.Exc_located@Ploc.Exc@g' \
-		-i "${S}/checker/checker.ml" \
-		-i "${S}/ide/coq.ml" \
-		-i "${S}/lib/util.ml" \
-		-i "${S}/lib/util.mli" \
-		-i "${S}/parsing/ppvernac.ml" \
-		-i "${S}/plugins/subtac/subtac_obligations.ml" \
-		-i "${S}/pretyping/cases.ml" \
-		-i "${S}/pretyping/pretype_errors.ml" \
-		-i "${S}/pretyping/typeclasses_errors.ml" \
-		-i "${S}/proofs/logic.ml" \
-		-i "${S}/proofs/refiner.ml" \
-		-i "${S}/tactics/class_tactics.ml4" \
-		-i "${S}/tactics/extratactics.ml4" \
-		-i "${S}/tactics/rewrite.ml4" \
-		-i "${S}/tactics/tacinterp.ml" \
-		-i "${S}/toplevel/cerrors.ml" \
-		-i "${S}/toplevel/toplevel.ml" \
-		-i "${S}/toplevel/vernac.ml" \
-		|| die "Could not rename deprecated Stdpp.Exc_located to Ploc.Exc"
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--camlp5dir ${ocaml_lib}/camlp5
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && domenu "${FILESDIR}/coqide.desktop"
-}
diff --git a/sci-mathematics/coq/coq-8.3_p3.ebuild b/sci-mathematics/coq/coq-8.3_p3.ebuild
deleted file mode 100644
index 0f6bea9a97c2..000000000000
--- a/sci-mathematics/coq/coq-8.3_p3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild,v 1.2 2012/03/24 13:59:39 gienah Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
-	>=dev-ml/camlp5-5.09[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# configure has an error at line 640 leading to closing a
-	# string to early in the generated coq_config.ml. Here is a
-	# wild sed which replaces \"$LABLGTKLIB\" by $LABLGTKLIB.  Note
-	# during pl2-bump: Hmm, my patch did not get applied upstream?
-	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
-	# Stdpp.Exc_located is an alias for Ploc.Exc, it has been
-	# deprecated for a while, and was removed in dev-ml/camlp5-6.05
-	# Fixed by upstream in svn repo:
-	# https://coq.inria.fr/bugs/show_bug.cgi?id=2728
-	sed -e 's@Stdpp.Exc_located@Ploc.Exc@g' \
-		-i "${S}/checker/checker.ml" \
-		-i "${S}/ide/coq.ml" \
-		-i "${S}/lib/util.ml" \
-		-i "${S}/lib/util.mli" \
-		-i "${S}/parsing/ppvernac.ml" \
-		-i "${S}/plugins/subtac/subtac_obligations.ml" \
-		-i "${S}/pretyping/cases.ml" \
-		-i "${S}/pretyping/pretype_errors.ml" \
-		-i "${S}/pretyping/typeclasses_errors.ml" \
-		-i "${S}/proofs/logic.ml" \
-		-i "${S}/proofs/refiner.ml" \
-		-i "${S}/tactics/class_tactics.ml4" \
-		-i "${S}/tactics/extratactics.ml4" \
-		-i "${S}/tactics/rewrite.ml4" \
-		-i "${S}/tactics/tacinterp.ml" \
-		-i "${S}/toplevel/cerrors.ml" \
-		-i "${S}/toplevel/toplevel.ml" \
-		-i "${S}/toplevel/vernac.ml" \
-		|| die "Could not rename deprecated Stdpp.Exc_located to Ploc.Exc"
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--camlp5dir ${ocaml_lib}/camlp5
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && domenu "${FILESDIR}/coqide.desktop"
-}
diff --git a/sci-mathematics/coq/coq-8.3_p4.ebuild b/sci-mathematics/coq/coq-8.3_p4.ebuild
deleted file mode 100644
index 9a0eb00cebf4..000000000000
--- a/sci-mathematics/coq/coq-8.3_p4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p4.ebuild,v 1.2 2012/08/24 13:39:48 aballier Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
-	>=dev-ml/camlp5-5.09[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# configure has an error at line 640 leading to closing a
-	# string to early in the generated coq_config.ml. Here is a
-	# wild sed which replaces \"$LABLGTKLIB\" by $LABLGTKLIB.  Note
-	# during pl2-bump: Hmm, my patch did not get applied upstream?
-	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
-	has_version '>=dev-ml/lablgtk-2.16' && epatch "${FILESDIR}/lablgtk216.patch"
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--camlp5dir ${ocaml_lib}/camlp5
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && domenu "${FILESDIR}/coqide.desktop"
-}
diff --git a/sci-mathematics/coq/coq-8.4.ebuild b/sci-mathematics/coq/coq-8.4.ebuild
deleted file mode 100644
index 8e424ba1dd6d..000000000000
--- a/sci-mathematics/coq/coq-8.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4.ebuild,v 1.2 2012/10/06 21:07:26 aballier Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND=">=dev-lang/ocaml-3.11.2[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3[ocamlopt?] )
-	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-tex/xcolor
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathextra
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	has_version '>=dev-ml/lablgtk-2.16' && epatch "${FILESDIR}/coq-8.4-lablgtk216.patch"
-}
-
-src_configure() {
-	ocaml_lib=`ocamlc -where`
-	local myconf="--prefix /usr
-		--bindir /usr/bin
-		--libdir /usr/$(get_libdir)/coq
-		--mandir /usr/share/man
-		--emacslib /usr/share/emacs/site-lisp
-		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		--docdir /usr/share/doc/${PF}
-		--configdir /etc/xdg/${PN}
-		--lablgtkdir ${ocaml_lib}/lablgtk2"
-
-	use debug && myconf="--debug $myconf"
-	use doc || myconf="$myconf --with-doc no"
-
-	if use gtk; then
-		use ocamlopt && myconf="$myconf --coqide opt"
-		use ocamlopt || myconf="$myconf --coqide byte"
-	else
-		myconf="$myconf --coqide no"
-	fi
-	use ocamlopt || myconf="$myconf -byte-only"
-	use ocamlopt && myconf="$myconf --opt"
-
-	use camlp5 || myconf="$myconf --usecamlp4"
-	use camlp5 && myconf="$myconf --camlp5dir ${ocaml_lib}/camlp5"
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure $myconf || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
-	dodoc README CREDITS CHANGES
-
-	use gtk && make_desktop_entry "/usr/bin/coqide" "Coq IDE" "/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch b/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch
deleted file mode 100644
index 51b929681963..000000000000
--- a/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build with lablgtk 2.16.
-Apply conditionally because it uses new types introduced in this version.
-
-Index: coq-8.4/ide/preferences.ml
-===================================================================
---- coq-8.4.orig/ide/preferences.ml
-+++ coq-8.4/ide/preferences.ml
-@@ -35,7 +35,7 @@ let mod_to_str (m:Gdk.Tags.modifier) =
-     | `MOD5 -> "<Mod5>"
-     | `CONTROL -> "<Control>"
-     | `SHIFT -> "<Shift>"
--    |  `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK -> ""
-+    |  `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK | `HYPER | `META | `RELEASE | `SUPER -> ""
- 
- let mod_list_to_str l = List.fold_left (fun s m -> (mod_to_str m)^s) "" l
- 
-Index: coq-8.4/ide/utils/okey.ml
-===================================================================
---- coq-8.4.orig/ide/utils/okey.ml
-+++ coq-8.4/ide/utils/okey.ml
-@@ -47,6 +47,10 @@ let int_of_modifier = function
-   | `BUTTON3 -> 1024
-   | `BUTTON4 -> 2048
-   | `BUTTON5 -> 4096
-+  | `HYPER -> 8192
-+  | `META -> 16384
-+  | `RELEASE -> 32768
-+  | `SUPER -> 65536
- 
- let print_modifier l =
-   List.iter
diff --git a/sci-mathematics/coq/files/lablgtk216.patch b/sci-mathematics/coq/files/lablgtk216.patch
deleted file mode 100644
index d123e89683e1..000000000000
--- a/sci-mathematics/coq/files/lablgtk216.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix build with lablgtk 2.16.
-Apply conditionally because it uses new types introduced in this version.
-
-
-Index: coq-8.3pl4/ide/preferences.ml
-===================================================================
---- coq-8.3pl4.orig/ide/preferences.ml
-+++ coq-8.3pl4/ide/preferences.ml
-@@ -31,6 +31,10 @@ let mod_to_str (m:Gdk.Tags.modifier) =
-     | `CONTROL -> "CONTROL"
-     | `LOCK -> "LOCK"
-     | `SHIFT -> "SHIFT"
-+    | `HYPER -> "HYPER"
-+    | `META -> "META"
-+    | `RELEASE -> "RELEASE"
-+    | `SUPER -> "SUPER"
- 
- let (str_to_mod:string -> Gdk.Tags.modifier) =
-   function
-@@ -47,6 +51,10 @@ let (str_to_mod:string -> Gdk.Tags.modif
-     | "CONTROL" -> `CONTROL
-     | "LOCK" -> `LOCK
-     | "SHIFT" -> `SHIFT
-+    | "HYPER" -> `HYPER
-+    | "META" -> `META
-+    | "RELEASE" -> `RELEASE
-+    | "SUPER" -> `SUPER
-     | s -> `MOD1
- 
- type pref =
-Index: coq-8.3pl4/ide/utils/okey.ml
-===================================================================
---- coq-8.3pl4.orig/ide/utils/okey.ml
-+++ coq-8.3pl4/ide/utils/okey.ml
-@@ -47,6 +47,10 @@ let int_of_modifier = function
-   | `BUTTON3 -> 1024
-   | `BUTTON4 -> 2048
-   | `BUTTON5 -> 4096
-+  | `HYPER -> 8192
-+  | `META -> 16384
-+  | `RELEASE -> 32768
-+  | `SUPER -> 65536
- 
- let print_modifier l =
-   List.iter