fix build with lablgtk 2.16

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

4 files changed, 68 insertions, 17 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 44cc26d91b70..20229384bfcc 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,10 @@
 # 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.70 2012/05/17 14:52:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.71 2012/08/24 13:39:48 aballier Exp $
+
+  24 Aug 2012; Alexis Ballier <aballier@gentoo.org> +files/lablgtk216.patch,
+  coq-8.3_p4.ebuild:
+  fix build with lablgtk 2.16
 
 *coq-8.3_p4 (17 May 2012)
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index ddc54e151594..8c43af5b36ba 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX coqide.desktop 233 RMD160 3f9d112d7f55454f72c42b427005b37971c6e928 SHA1 40571b86c25793e7d4e9bef80f637d7440b03704 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac
-DIST coq-8.3pl1.tar.gz 3756961 RMD160 687983bcaca723299b6ea902a1e1b07338209d55 SHA1 3fae9fa2fd6f39c9fb3c0b67fcd5e71f1e7a5f9f SHA256 3a497386bd74f43a5af1d0c53f29a017ce7ed1b1e60c052217fe04b7f40be928
-DIST coq-8.3pl2.tar.gz 3760176 RMD160 f59ee288a35c1009f88f050362bee21311b459a8 SHA1 8506761e4755739cc728aff790dd778db8217f3f SHA256 b82b44ec585903b6bfadca02008eb5549cda46038c776ec115bc408c4e0f34f1
-DIST coq-8.3pl3.tar.gz 3859883 RMD160 8d44bb8df810c644d10c53d0496cd28ea66fcbb3 SHA1 a5b0cbca8bf556fe7eb804ccdb39bba49e1ae014 SHA256 af259e9a723761327137018fdc0b98ada71095ff033b9e169d175d92b9537947
-DIST coq-8.3pl4.tar.gz 3855074 RMD160 ed6dc4516210667707b9206aeaef260ce6bef7ef SHA1 c1c012b0b4fa134bb34db5353696b40fb5a213c8 SHA256 79f26cee0f9eb0bea376ff7eca4e9b9cbcacd179a264cb550e39e20a59a5a39d
-EBUILD coq-8.3_p1.ebuild 2142 RMD160 9f6c3f5ffcd8a6575ab544eb1a30e10a353d23ee SHA1 7385d4ac8d7ec8b248a152942afbe8bc07941f51 SHA256 812c6ef68e6cbd4608eec74489e850c8349be6d79901d76f31e4c709be67767b
-EBUILD coq-8.3_p2.ebuild 3163 RMD160 5c1786fc791605cd3f69bf709e8b7489d980b7a7 SHA1 125fa92ffa6271eaf8ad69e084285c9278f22d44 SHA256 c20212a95b2aa6cd7e9a889ae2f26c512ddc46322d487d5d87be31170edbed97
-EBUILD coq-8.3_p3.ebuild 3163 RMD160 d777060a3af22b750e1621a188ebe6360aa23ade SHA1 995ca24bcaa5ac1c78f77b3fc19c77050c2fd5b0 SHA256 4e32cd0c79e31db0e3bae0d5bb758d29d27b1041831969e3e007b8dc6cfe7f14
-EBUILD coq-8.3_p4.ebuild 2216 RMD160 9a208f345ccc10211bb6f04bd737c0054fa27bb8 SHA1 db9011b4d97898deef1994313277e76f579c79c5 SHA256 52b0bf7711d0ab949c21b66221edceba8dc9032790844cc4441cb0b06bbf63f4
-MISC ChangeLog 11557 RMD160 567b7c8c575bf8036dec4405fdab47cff375f4b2 SHA1 5fcf53c8d473c9312dd80dd745ac32a3df0d3f43 SHA256 04c633b873b7bd09953eb21a9a2ace25db69704dd30e073cc62482fc564bf76b
-MISC metadata.xml 788 RMD160 98e6a38354c1398f7bed64f34aa88e1d439190b3 SHA1 7d9ce5fed17eaf9bf756b493c76c27678212995b SHA256 5028003bf6d1ec17b51ce45c17bb565137f825a5eefcdf57de4a98c5c61d0626
+AUX coqide.desktop 233 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac SHA512 3fcf18f008b1c5fb465c34e9e478552e66000bf5cfbdd89fae40c88e30cf47c96783019b4c7cf6c7720651f88411ba2c4e5ad142453e4a1931af1cb2d4b0c5d8 WHIRLPOOL b7913b175acbb216941d637dc5c639f3e979511723b289c308c387028c13499efd379ea5d3d1ff73d42b061049feb09e49ff619a3a99b0179f7c7ab7170eaa5e
+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
+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 11686 SHA256 81c199a73143edc14014d69729cbaa183f5ac87d92ba4024e1b4884b3f9ab467 SHA512 b7bdb4f055e777054f2d355629a692f1ddeb9f183bba586d0e1ff107e10cdb412d64910b9d1fddaed2e6b7a8082084135a59f9f34520f5d3198f55a152febdcb WHIRLPOOL df5bf5e79e5160804b52352f8329f83f8e747566a022ec619aa01766d0c2a0845844616d273fd3264612541f7110317ed20db976ecf781ff319cca387ae26a8d
+MISC metadata.xml 788 SHA256 5028003bf6d1ec17b51ce45c17bb565137f825a5eefcdf57de4a98c5c61d0626 SHA512 1db2cbc8d35aaa9d9cc196eae2b73bd43214c3e19ded7544fd74f48eeaa067fb653ca1635a07fbd5784250a6978c28b0e0b9eb0a29a524b97dcc0e6bf54ae2b4 WHIRLPOOL 872ddacf2c445c198fb939a673fd07a7ec5bb7ce6bf5c424863b85174e6a6e83c536e3c700de3b757e0060fe7ff27a31ad6300c0317f5a1e746f8ad4a3523b30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1ELMACgkQvFcC4BYPU0qQjQCggj+VfSL7P2xWsCmrP/GncRuZ
-sr0AoJApD9nWSYWfS9wyJWmlUXujuKq9
-=N8T3
+iEYEAREIAAYFAlA3hCkACgkQvFcC4BYPU0pEkACdHZjq8t2Rz8qbYBMT1rm9jK5D
+CmUAnRf/wDrjQblwkZSmSwlQ+Bdcuy51
+=ATDU
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.3_p4.ebuild b/sci-mathematics/coq/coq-8.3_p4.ebuild
index 208172c49e02..9a0eb00cebf4 100644
--- a/sci-mathematics/coq/coq-8.3_p4.ebuild
+++ b/sci-mathematics/coq/coq-8.3_p4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/05/17 14:52:29 aballier Exp $
+# $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"
 
@@ -40,6 +40,7 @@ src_prepare() {
 	# 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() {
diff --git a/sci-mathematics/coq/files/lablgtk216.patch b/sci-mathematics/coq/files/lablgtk216.patch
new file mode 100644
index 000000000000..d123e89683e1
--- /dev/null
+++ b/sci-mathematics/coq/files/lablgtk216.patch
@@ -0,0 +1,45 @@
+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