Don't rely on image-load-path always being defined, bug 426646.

Package-Manager: portage-2.1.11.7/cvs/Linux x86_64

4 files changed, 39 insertions, 19 deletions

diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog
index 9bece0081469..051a20aa6baf 100644
--- a/app-emacs/proofgeneral/ChangeLog
+++ b/app-emacs/proofgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/proofgeneral
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.36 2012/03/08 11:31:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.37 2012/07/14 21:14:04 ulm Exp $
+
+  14 Jul 2012; Ulrich Müller <ulm@gentoo.org> proofgeneral-4.1.ebuild,
+  +files/proofgeneral-4.1-image-load-path.patch:
+  Don't rely on image-load-path always being defined, bug 426646.
 
   08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> proofgeneral-4.1.ebuild:
   x86 stable wrt bug #404605
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8992774b8217..79c5be56ecad 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50proofgeneral-gentoo.el 68 SHA256 85504cdc0876b745d6989be00b87cc88ffc1dd6dfabff96a3cc3c3d48dfbe898 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca WHIRLPOOL f86e9df144b08f403c71efbd74ba2076e3a25ba05c09253bd8c60046297db04a1e33b67b7d1769109fcb1ce984b25d43f80470defd2573d0c3333193db3ddf54
 AUX proofgeneral-4.1-emacs-24.patch 3180 SHA256 0c12b506ade463617fe2cbfa003b2661ae6e0d1c276c8960c2dac18faa388fda SHA512 5fbb0e32ed10eef4ebdb56eab6aa5795d5393ce9b37524840eebf10952153e2a67f4f9f201464720a7fc55427cf62fe5f4348ad1e08ef8ac395806e41211f5ae WHIRLPOOL 0b573b95ff38814d7d7988d3a93e64453a7c98c0aacd5449385932dba0a03818c8f0e23cf600cfa687c5d0b8cd534cf7388cd8b2b971c3eff5334974f7a8495a
+AUX proofgeneral-4.1-image-load-path.patch 597 SHA256 06026f751b75faad32b49b2b12698ec9b38e746230f6b0ddc11b6993bbbc5a90 SHA512 74f2aec14479655fdebd0eeb0c5d4d3d7545abe4b815c9db20b6b25fd74f1fdced0bd25b20441ef59326bf9ed6f66374ccf63fd1cea3f1758927f4f8a6e59b41 WHIRLPOOL 9ab1c6a39b234af448ae497ad0ae833317bbcd47656df8866ed0b6e5d0f9e1828e692e8f05f6fe1b35df68b6efe9b0184cbee6b3c2772cbc552dedd11c33de7a
 DIST ProofGeneral-3.7.1.tgz 2023176 SHA256 e613aa2f24564465f450b06b2d804e6815b220652c9f778e3d3471b644fdaa93 SHA512 5d5f64a2c7a8e9e18ac9927a6bb938fb618c24f9ed566d5dcbe39b5befd45104c9e2cfd11fa620d32e582fb72dc5483bce9cc7e847f5009ceaea97c7ca6d738c WHIRLPOOL 7301c22d86dff0fd6de08de53924ad6f20725aecec15ef1010f2378474d0e4e2ea7a6bff900ba03d87180d605fbf6afc427bb73f70fbe1d7dfca9714525651e2
 DIST ProofGeneral-4.0.tgz 1351482 SHA256 b8aeefd5619683216ff57bae81236dfab71d43d6eefa371d38749fc43415cfaa SHA512 4e2b431a98a620dd5833f3c16922d85e7bb97b36c692ab973bf38c9bcdf866d77e452f8fe95bd53f96994ccdbd323f2e761ecfbf15cc29671688eeef9f5cd861 WHIRLPOOL 91408a0078f68d0dd2b8572facf19f37cc3941cc92c5641e63bd4a433d0d68361515258f2406cf69f0d483fbc6d246d9e13a52ab404c8863f38ae2ef9ef67552
 DIST ProofGeneral-4.1.tgz 1428499 SHA256 2a264d46b48185cf1a6ebcca958e59171ea670fb0fc82ba46b8e1d6918ea7dc7 SHA512 f9bb7ef270b5c793f58441db9287b5018176d8d9d91cc9a2a975c1f0d7a450f1c150d21df16f982738f3562c74d5ae05d61fed5b1c1d6a3eb26cab0131d64696 WHIRLPOOL 02a4f2adc4dc39a19b6a4a46e0e2fb8a80e4340f38470c842425b63ee4c946e8f9b91d51eaafbcce01dc39e81009ebf6e327c1faf294249bf7b32a387444d4e8
 EBUILD proofgeneral-3.7.1.ebuild 1344 SHA256 0199b19bf18c0c20cfa5719dcfbec325511013d00f777c2b1c25ee72719806ba SHA512 1eceba65beb041dc110127c724087d5471ed00359f8907b4ddb8f378072f09b8eb83c4d6d0f59ee0f7d37f669f1f3587d03b38c7b02de543ba55b5acb517e1fc WHIRLPOOL 965762275b09d744e78eca6ccc85611bb9f049af87155acac383c6276ed133f742036cffb6b14926171103d5d81e992483651263f5e5c816d904fdf82937fbf7
 EBUILD proofgeneral-4.0.ebuild 1528 SHA256 8d9e9a1e1c800a7333eb75fd8ab4113817d28be3f19452aacf06d2af4699263f SHA512 759a64357941ace6113f2a9d777e51a192aa2edd0509e699157a1fba3e8cd5953b0529eb02deafc05b68f995c44e8ee463926478be2b560d4f440a36af06ecb5 WHIRLPOOL bb0e3ebe9d32dfbee8b4fcae2181aedbe638303e321e78fb070cc45a0fe7b59341b6c1c803b46fdecefeea83bd5a733c5ac2ef9a9bc00c4975a6523685e9ff5b
-EBUILD proofgeneral-4.1.ebuild 1534 SHA256 c387ce21706df369b70ab549e09085ced2634dcc68f90b5f9b698381076175c4 SHA512 05ff411491a4ebc85eb85a57d032b499f1996e0fa08d082bf3dd3e96de6db97e6f56ccd4d429f2f1849aeaec0eac2fe72ab877df298fde82cb6eb613c7a48f23 WHIRLPOOL 91449594b609b868f785166f1cd56b4536de997683fb69c17356e85400a2a51e8b178ed960d336e8389405239a9a1bfdb601487b973dff8fd684077f8ea792c3
-MISC ChangeLog 5257 SHA256 8b8cd7cdd59b6f1e39d8ffc027af11f6ab34218761110485e730a76e87749068 SHA512 7ad52879f5a0eb68a7d6222b2158f78ed39feaaa06170d18e662b36070c4e18c74fb8f5d7422b543c118d7012eb1b62e80eaa885ad12bb92a5f2af7a889f6b00 WHIRLPOOL b5b30cf6c4fa8e5eb9fe56b58b6f94b03b7dd585d21db05d424262e1864f90d5876ba7288a6ec52b15bcaa22de41b80af3a1b03f6cee71a8550ad9181266df3d
+EBUILD proofgeneral-4.1.ebuild 1555 SHA256 879cb007ef8fd95b3187748dfd7d9e7e16fa9442d9dbf5d7ca0ce683cd3858cc SHA512 481e8bc8dbed97f7d6e04317c49cdecdf4993715d4a882f47db4c9ee3834ad3ee7f632eef2255b9658d08a3d10f4f0fcbf29984ad3096ea5e0614f7734a7c67e WHIRLPOOL 20758ae9516a25bfaed551486e6e3301e4bb2e8bd2fb369a7640c8e45cde78c0c160dbb4a0ba9714e03f1712d086f186b1ec3df54541d20ce014c84c82bec2c3
+MISC ChangeLog 5438 SHA256 f996421a3ca0995633ebb4fb3629963fdbf49c7e466427abe6229e78fcdbf288 SHA512 d8619433c1438f91d58a88dddb344e3c75741c79ec242f086fa149c2cc541e167db4963c0b90c7e24bbf7bdf06f7105d99295c5057a851737038122aa88469ad WHIRLPOOL 976841f584c8f5d06ae135c54edee6a79369d419670facecba3771cb2cf00617d50b72c6b4639d5ff765a0b3afe7e2f89b565cb2daf5c6bf3186a655ec6fc149
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fMgAAoJEDxpGckxwJCBmNAQAJdQVyyiDIY3zlIYPnOHajZo
-y7ebBKM/KugtGPyON5lcadxFREHEEqPh7XlnVFB8dTczZtGmotAgq9HBX9xu18YL
-d/9O/r43kIxk6P/+JH2Tzf7e2c+q7Rc0afMMkcomN4gGmyHn5dihZhffSYvyEfRi
-J3irnfJyC7gY1FjMAiXUH8EqRe05/gn51fF5slqPRRvAz6SwZWNR4oCCWiIz3Xl9
-vHy4oljxtEd2rIghrtlDZcZcUDn5E1RYYX/ryco5PAqug9QiswT/UnL21bIwezvO
-l6ujxUhl1fBT+MyjhusX9yHUihgqhyweYAePDV7bLXbovvPrlr4J2u2CYmhxJzAl
-hyAxBslQGZpkQH1I0JAOWCjoszOSnkb5KDJRe2ovWLgSgoT1ZosISqVWNFOgkKRl
-X304xPVwVfVkRjqNp8It6xgTaEiNVxD34CX4BHyXqBkR3Oj/VDwqTWWjUxRCWzxb
-kuBJfrik1/mcA7M2tz3xypI9UMtOFebqxY2D5Nd6HvA3Jf9N9USwRZs8n8BItjDK
-vD/H0Bhzjm68fAhAvB+AkDsN7XuX+bjaTHG6TYuXN/WpI6iz+/V9bdYUgByW7XX3
-wjqW7iiaouZ+NaWLHjoN8xIByCHZRLTqGO82avURWzAwA84wpPGOxTFdokG8/QXb
-Qjt2+PFMHSI613naxMWN
-=rMhx
+iQIcBAEBCAAGBQJQAeKbAAoJEDxpGckxwJCBUxgP/3Ug3ocQ+twILJzcm0TW7T/t
+nlwao37ZaZqhWrugwsXZf6ZRsiG9w8HJnSeJdCRn37SdPPyAZcYIWbdfnFNghc0h
+/X7AkCjojkqoJm6Ukt1oNUIltzXP/Tc+CYy/UJ/eohXmzDybGz7kQKR4LXU0Ls+G
+Lvca/JPdTMUn7PAJGLWCt8kloa6i/2Mi9LWsQf3qP3YEs7P4n5p7NV4AKg20dFrG
+NmPS8lWRCwX3kFhhWBnI+3tgEDltDnobfTUgU3vxRxpBOTCu6ksgMYWiywOXLnLP
+2EHc4Z8QTXHY6IORH24lO3lKRRi96hlaB32c2rKRuU+kVIaKbszEYRnW/VEZAJkV
+ZDozr11wqwLUSFeSy55OcM0PrtjN6+Ye5kZmspat31QsW6N+YyOzJAEwaepctvea
+H/0RMlAvaSOcEHaA3IZqKBDqcI2ot2CyV+StShZJMD0KoF4dRYsiiXWO1sDqpbYs
+/S/kRXVfWxKKfJ1CXDQn1Ae+kvzrQ3auwyYxfO9o+mgbsF+HwXqrHBXu6VlULSsh
+TyjS9NUCUrF4fA1mvQPPkEGkTDemxY7bfH9piw4tr4hwyAoKMNwyuKJpXzCLDxRv
+XVpwiDaIXB3h+72lmC+fzoyAz1TqrIU9p96d827QwAba1SkbvhQ6uF3Aw05ktPS+
+2ajN+4JGIlNUI3Gghmps
+=Oa0s
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch b/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch
new file mode 100644
index 000000000000..238c022de08c
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/426646
+
+--- ProofGeneral-orig/generic/proof-toolbar.el
++++ ProofGeneral/generic/proof-toolbar.el
+@@ -103,7 +103,8 @@
+   (when (proof-toolbar-available-p)
+     (unless proof-toolbar-map
+       (setq proof-toolbar-map (make-sparse-keymap))
+-      (add-to-list 'image-load-path proof-images-directory) ; rude?
++      (if (boundp 'image-load-path)
++	  (add-to-list 'image-load-path proof-images-directory)) ; rude?
+       (mapc 'proof-toolbar-make-icon (proof-ass toolbar-entries))
+       (proof-toolbar-make-toolbar-items proof-toolbar-map
+ 					(proof-ass toolbar-entries)))
diff --git a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild b/app-emacs/proofgeneral/proofgeneral-4.1.ebuild
index 312a524bf2f6..a49b6752dcd4 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.1.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/app-emacs/proofgeneral/proofgeneral-4.1.ebuild,v 1.4 2012/03/08 11:31:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.1.ebuild,v 1.5 2012/07/14 21:14:04 ulm Exp $
 
 EAPI=4
 NEED_EMACS=23
@@ -21,7 +21,8 @@ DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
-ELISP_PATCHES="${P}-emacs-24.patch"
+ELISP_PATCHES="${P}-emacs-24.patch
+	${P}-image-load-path.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {