version bump, use camlp4 and switch the desktop entry to make_desktop_entry

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

4 files changed, 123 insertions, 5 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 95374cf97923..e63069894921 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.72 2012/08/24 13:41:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.73 2012/08/24 16:01:19 aballier Exp $
+
+*coq-8.4 (24 Aug 2012)
+
+  24 Aug 2012; Alexis Ballier <aballier@gentoo.org> +coq-8.4.ebuild,
+  +files/coq-8.4-lablgtk216.patch:
+  version bump, use camlp4 and switch the desktop entry to make_desktop_entry
 
   24 Aug 2012; Alexis Ballier <aballier@gentoo.org> files/coqide.desktop:
   Add Science category to the desktop entry, fixing a repoman warning.
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index a966fe1f4583..f53f90692bac 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX coq-8.4-lablgtk216.patch 1074 SHA256 8e85d56a85660e9fe5090606a512fb1cc542288482ec6e69c4809d70072ca1bc SHA512 0504528d02e65de0330d95c3508aba379439b470a1a8c47ccd904469ab3bbb3f9267fdb5ccb7b603401d351619571a0bdf8a2b0dc75b1dde3ee288e6bcb7b9d9 WHIRLPOOL a7984aa30af6520e965406fff6925b9a6bc0a719807aa85832d285ee3a344ceecbb8e651bfe371e26135cc02d055baece962f664582316f445301ebfe10cfe7b
 AUX coqide.desktop 241 SHA256 4d2fd36d987021fe2f5a546d9c80c78700830931512e6970d44cfbba3dad50e4 SHA512 ee74f41a2684b9dcac099ef58d4d9b498382c4d109277fd2efcd984a2c8e38667040c899c91ebb136b735a8edea48a4a746c12034d280ffaf6bae83c61bd854d WHIRLPOOL d38bf0114b0c285fe18e2a799d41cfe01db8f24bc9deaf88b266160fc32c694914faea01143edc749e0bc67ed47f02ee2338a309947e4ff1fc44dba508f99112
 AUX lablgtk216.patch 1268 SHA256 fcd9e6c534174ca23ff730a7ee21130cd80d42b1ff83e5bafbfcf3e94dcd2d5e SHA512 63b0922932781ad607dea4b3683aa448877011f28f8a3ad68ec3cac500536e4999118f586dd9ed21d4963bede7eb8a692a6eee7447182a034277f6149c29bb97 WHIRLPOOL cd4be7c5356401ea00fee9f7384b3c445fbf52dc39692f7830ec54e9ca89703c37986e14475220d0315aba65df36190a79d032c8e964d389250bd56002c52253
 DIST coq-8.3pl1.tar.gz 3756961 SHA256 3a497386bd74f43a5af1d0c53f29a017ce7ed1b1e60c052217fe04b7f40be928
 DIST coq-8.3pl2.tar.gz 3760176 SHA256 b82b44ec585903b6bfadca02008eb5549cda46038c776ec115bc408c4e0f34f1
 DIST coq-8.3pl3.tar.gz 3859883 SHA256 af259e9a723761327137018fdc0b98ada71095ff033b9e169d175d92b9537947
 DIST coq-8.3pl4.tar.gz 3855074 SHA256 79f26cee0f9eb0bea376ff7eca4e9b9cbcacd179a264cb550e39e20a59a5a39d SHA512 0471f3fca4752e080ed9d320db3bc0ca68b6b9a4fdb4f9ab5ac142e48fca9f7e8b3f0c511f9093fd816053436f47fd884b237c9158e9c0ae224c8f7883cfe834 WHIRLPOOL 3b780b6cd9de0e3d2c25295f40fe9cf284b4743fb883846048ea1102d023641bafb0462eaea0e03fc41157aefe6c83e6fc47464b4c0ce1ca81165d00ee1c92fd
+DIST coq-8.4.tar.gz 4134779 SHA256 f46ae5b6f0bea9dc299de6f3c020ee75c40581e32a1832e9a290d098a6a2424d SHA512 c9429ecb8c692d45c91d9c3dad093cb2e51f0af63ec99643eea584373156d0cd46a6e1eb278482e57dbf37ef59752506faa8485584445763e05d2ab06dfeab49 WHIRLPOOL d367ed3be355a78b5a8d86bf26975c9d52b38656e2d2d9146dd1d88c4b3a4955c078b3782ac10ad78cfe682fad64ce77c58c5ebce96ad3fb0a06d477c12242b7
 EBUILD coq-8.3_p1.ebuild 2142 SHA256 812c6ef68e6cbd4608eec74489e850c8349be6d79901d76f31e4c709be67767b SHA512 17c78f6e06cb5d18605db78ed160c8ba0fcd6255e00d9d9dfb716408e858aab653c2e182ab8b13fe5efc68fb0055d02b9bd4191d01a21dd828f960526cb14e35 WHIRLPOOL 660cf865954a2b464f88117dd55a756931f82e4a828135997b3ebd95512301ec6b6166ad6800cc8a3442c0683bd1c84714f59f4c6ea20ace42f21a94066d436b
 EBUILD coq-8.3_p2.ebuild 3163 SHA256 c20212a95b2aa6cd7e9a889ae2f26c512ddc46322d487d5d87be31170edbed97 SHA512 0cc6f75c0cf02cded5e59069af0ce210567492ee15c9ec78a0f97a9169566f9599c3665e56f3d6ec7752522e1804e0e09f090542f767881c7ac2f4744b41ccac WHIRLPOOL 22365cc2f8f888204ac9b8a5ae99b6c96ef6ae4166946e6ecdfdb5b0acb3d845402bd0ee1a755b1c6674911c5635254dae945372ffb30f98e28182bedc39da81
 EBUILD coq-8.3_p3.ebuild 3163 SHA256 4e32cd0c79e31db0e3bae0d5bb758d29d27b1041831969e3e007b8dc6cfe7f14 SHA512 5facbea063bf01d0b7de3a57e60dac2b71c463ad6a825dd0f9bb6f82a6cd72541049bd47028e596fcdbc04636d9a962bfc06c6fa526397458603a17475300bcb WHIRLPOOL d268813788a1ccb8402f8ce1692ccd059dcdca8e6a740d254e1951f6a385f3b38fb365a3d6ecdedec85b19adfaf164dfca22e2a296afb217fcf8e8c174da6974
 EBUILD coq-8.3_p4.ebuild 2294 SHA256 ca624d78df0303cc800689a694245081b7eeae6cd9fa2c423136b8df5009175f SHA512 112b8f41fa918cd299ed1c14f4ddc07e99946c3bd8b67d5c90dca8e131554fba6050439fd6aa7f7b35ddde5ffc3170e897ec7c1135892e82eb3999788ca7451e WHIRLPOOL a06ac98ae5633a8ab9b89041e40ddc382eb4cb35fe3d24136da1dec685eff32d936c128a330fa921dd58b9ba4851dc3fbdf051a5170602309618bb39b3d38888
-MISC ChangeLog 11832 SHA256 a78e772eee4dd049e662dcc33069d30a7c223bf1fa1e1713695df04d8ec490a8 SHA512 ae6a8693e7aaec9e85c844e27c1ad6b1bb2ae3b120a6f09171df3ab9853d6f74ecb100cc689f31024a7be0252fcf32f06861c5448f5fda48c05a7b32b1a88f15 WHIRLPOOL 340837c44293afa0898a708a0dfad0bdc9e440fe7ff81cd96ff654f00c61c674f076439e8c315781c022429965828174f0d53305ebf2c459a34997efcf8861db
+EBUILD coq-8.4.ebuild 1999 SHA256 8163a804b9ee27286f8a0b81faaec4f41ff4c731720e6a9305cdff38698b0362 SHA512 b4ac49fadae394c5a79dc169e931062536c6b360fa0e42abda12d8eb19efd57002b4766dfa8495fc2d3798749cc7ecdc203f633fd3a65a62435e560295a93978 WHIRLPOOL 26d1528f47f0065adbfc33783dc657d35b77636ab24e50093530de93411d714337c29462e236013ab70a988804c2fdceb252b7e72d4a78260dffea4e18a3634d
+MISC ChangeLog 12039 SHA256 212a71df00ffbdd120812369e1859b39be1304eb9c65b9bfae3dc5b986c3a820 SHA512 d58753c556cbeb72a90b0a700bd8defa21cfd82568b57fcde674d00bde263383be423a71e8d48c0b5b6a31cf678dcccdf863cecdb9714914aced5876186c150c WHIRLPOOL 8e21646d6850e05018a811419f4ade97d72ae4203535e1e917b6343b353f3b13b964835218993ea2f4e8b96c78ec2a24369b581694d3183e7824b821503fc45c
 MISC metadata.xml 788 SHA256 5028003bf6d1ec17b51ce45c17bb565137f825a5eefcdf57de4a98c5c61d0626 SHA512 1db2cbc8d35aaa9d9cc196eae2b73bd43214c3e19ded7544fd74f48eeaa067fb653ca1635a07fbd5784250a6978c28b0e0b9eb0a29a524b97dcc0e6bf54ae2b4 WHIRLPOOL 872ddacf2c445c198fb939a673fd07a7ec5bb7ce6bf5c424863b85174e6a6e83c536e3c700de3b757e0060fe7ff27a31ad6300c0317f5a1e746f8ad4a3523b30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA3hJIACgkQvFcC4BYPU0oS/wCfexeS6GM1hyUCrUfAHSyt3hNO
-FXcAnjXEh+fSbLL7hIJy2md8kd97CSDK
-=cvMs
+iEYEAREIAAYFAlA3pVUACgkQvFcC4BYPU0rMiACcDD4pNcAzPuBMmdXMsh55iBvO
+7pIAoL9D0Skd4mygzbaZstQ9m6vhEnz8
+=Jphn
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.4.ebuild b/sci-mathematics/coq/coq-8.4.ebuild
new file mode 100644
index 000000000000..fca884d2e6ab
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.4.ebuild
@@ -0,0 +1,78 @@
+# 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.1 2012/08/24 16:01:19 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.11.2[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}
+		--usecamlp4
+		--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 && 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
new file mode 100644
index 000000000000..51b929681963
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch
@@ -0,0 +1,31 @@
+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