Fix javadoc failure with libnotify-0.7 reported in bug #360837.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

2 files changed, 82 insertions, 55 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 2e99fb08d215..475f767b8b63 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.108 2011/03/14 20:46:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.109 2011/03/28 16:15:51 serkan Exp $
+
+  28 Mar 2011; Serkan Kaba <serkan@gentoo.org>
+  files/java-gnome-4.0.19-libnotify-0.7.patch:
+  Fix javadoc failure with libnotify-0.7 reported in bug #360837.
 
   14 Mar 2011; Markos Chandras <hwoarang@gentoo.org> java-gnome-4.0.19.ebuild:
   Stable on amd64 wrt bug #358733
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
index 13b3ce7a2174..d71be1bf995a 100644
--- a/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
+++ b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
@@ -1,8 +1,8 @@
 # Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: serkan@gentoo.org-20110313222348-t01i70f8rcedd8by
+# revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
 # target_branch: ../mainline
-# testament_sha1: 131e1368d563e766440b56049743d2dc2f9ea6e1
-# timestamp: 2011-03-14 00:28:45 +0200
+# testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
+# timestamp: 2011-03-28 19:11:05 +0300
 # source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
 #   4.0.19-libnotify-0.7.patch
 # base_revision_id: andrew@operationaldynamics.com-20110214064042-\
@@ -67,6 +67,19 @@
  			"FIXME");
  
 
+=== modified file 'doc/examples/notify/ExampleLowBattery.java'
+--- doc/examples/notify/ExampleLowBattery.java	2010-01-06 06:54:34 +0000
++++ doc/examples/notify/ExampleLowBattery.java	2011-03-28 16:05:00 +0000
+@@ -61,7 +61,7 @@
+          */
+ 
+         notification = new Notification("Low Battery Example", "Your battery is low!",
+-                "messagebox_warning", icon);
++                "messagebox_warning");
+ 
+         /*
+          * Quit the application after notification disappears.
+
 === modified file 'src/bindings/org/gnome/notify/Notification.java'
 --- src/bindings/org/gnome/notify/Notification.java	2011-02-14 03:34:07 +0000
 +++ src/bindings/org/gnome/notify/Notification.java	2011-03-13 22:23:48 +0000
@@ -215,54 +228,64 @@
    (c-name "notify_notification_show")
 
 # Begin bundle
-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
-IcSuRTOEwzjBE3RfsVvq8P/i7kinChIMp0h4QA==
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYC7DCIACghfgGQ0UH///3//
+//C////4YA8dZ9xu46SdZbWaakqAoAZ9be83nuFDIehp7YKESiQZSepimaU9ED1D1Hih6TJtIAaA
+0AANAeUCUQCYBNQRKf6o0hpk9T0npAYg2oAaaeoGgOMjTJiaDJkwmmQMhoDQGmTQwAmgMJESZECN
+MTTKeqYw1TaTGp6mmTaTQNMj0mmmg0BJVE2jQjNCYmmENNP1Q09E2kejUwR6hoeoGEAkkEAEyA0N
+BBkiehqZPIaamJPU9R6nqDQbU0lswJsE7CsC4hcgMGbOQ7q0NbmapCXrHz6wR2GWwpYUeWhigoZK
+BRcS0pX8rt1mLkAhhrkgJHjh/X9W+eJa4a/04wbaiV+js0OQSE2bW61UKvY1WrBaqWUG320Xgm0E
+JunEVhJjuCJAawksggoNlJAgD5AkleVaNLRjE3IUwT0jUdKX1RKD2ZyCGNg2mxttNo+PjFm96QfE
+PlVWvZCgbGhwzVBw6Io4mdNM08TuKGO1C1CLykWutV30pWd19s76tZjvrM3Y3Rsmg5ImFjaKYoxs
+vutN1YwawlEe6akoq98H8LJ39Q0J9yYdA8Byoe0BwfsBLwzpMiY52uaNQKItAfNsDI+53C/eoZCT
+XHWhKKJFsCwKkZ4CWR5D5A/zY9GzoboKx0E3AuIbgh9uAzO4hn7Bja37+nJyreaJxdiSmJ6HgHsF
+7XIR2huwc0wVuNuv0frjtiK0PABB8wXcCejRtG/5hvOgIBw5l6vE2bvnSYgYmkB8wgsusGLfzzkR
+yAVhBIsSUgbQ7A2UgWg4FIDcoTzCpCEEoyOQrzKwisLaRyZhcxCVO9L2B+/q/9z6j7upeVVTAREK
+IgiI58mzxW26qHO+TWGgSK4Qa6QkNihpYg9QmIJAtIUmLucKJODADAvLXo5WIKoOSgcXJCUkAE0c
+QUFBJEGxCwcu1gp7Tc8pYFYkMBNRfqaKghu+4gA+VOuqHDE+m3iJFCM0FqYGmV5FZVEPO0xVnyKi
+JCY5xnhET0E3GUo2iBshaqaRoUQuI1hUDpM84LXfJskD/JSWK/aK8NpdKFmzckQSC10iGaGs9IVG
+EVvDh6QqILFmjrxiCWhDuY8Ye0oCKKp2Q6TkBsiGbckrZQSWNVlV4g1wpCoJwnRLSFiJk7P9HoUb
+a3bHv5gArDViVbq2wgOQRYdQ5uZbxC4EldJjdACPkGgNeksqmVIgwMOUegDhwTRDjexSMhZ0ngQM
+/MFOvFfU10bQ7N540/kHXCQB6UnW1vyIaR42p5dibchLIC4WIkK8mnJGYc+YpGki9jNBpyJMj+A8
+dEQQyYQBgra7tlmmxCM6y2zZy61bgVUlIKQy57USV9prQFfteooEJRGYiDnObCeFMIvDYXWeiush
+NoJ6GSU6py1WFIDD3UPVxPS5JP3tmiYvnBMCNvTn4pEppJL8hlIjh7SsHRU5HY+Tx7AO/gQL+YS4
+rPajYGBjsPczp1ZIkatM0A10dVJJEQY1wkSRXgGubTOhWbZgGv03PlAZsuCcTJudx1yU2XhUzKYO
+54GCZhc8UKPgHDwUeLYzL15zmZfV3c0HVd+AQPIPIPi9gdKR56BBbUSpzqdGRbGZjUSrRGASSIZE
+DUzklqkdJEoT1fWhz0VuSUWZxmM+rRcUsOLZ5o0WkvrAdg+0jr1NOGPYPhIEuTbjgIOL69SJpUFU
+GNZeBBIwhM9iunKRhBS2kNvXTWYrAbRLliGgt++AH2YxR5dnWsHOHgtGp1AcwiKiEWbowJoVIy5o
+xo42acNRCHeJ2d3IbMmQbRTJc5aYMcbcNclZiBgdLg0C+65c3NX7sLXVBpu0JxbpeDv3hG2SCmGa
+u9xYu38kKQBJjy6vRqF8R6mVyy0ewnkJNMFGD0KZ7H2BsvLlEJal082UObtucRaXH87ncpxGxxar
+RowSxa3IdAT7PO3gPQYKnQUuLouKXG3UiT1LiECf/ofGhG8e9HNPR0YOS9YMczkkRjKQpPQC1SQS
+Gmpirnj0l0V4DGaS19kw7K4KCB04Xr6SH7aT3xNq0Gf5q0cMB4eA8IgdHdsmnkclsyIyOhgXvw2j
+6sz/BEPhAVCrg1bG91HqiqPtjQIpC+GI0YIGotAXnsUIvVX4ZU4HtoMMFsTC7jjsGg1RysjDIpJN
+OBT4Pg1gcc69VbC7sSbzYwBvyC0On+P9U6miaCbk5L9zeDJrkwj/HcsYKgdgTpOelgQ6sGXb19cE
+RLoekOhPoZESSsorGtapskaGlWPEiRLtgTJ1IzoRkQBm+Sg0tNvTQ6QkLDc8GBvzgQsqqFHcFZY6
+AoIKH4Yci3JbJ3oTN/JhhPtuzzjLw+cIp4D4wZgL3CiBmjoIKCOGArQVHBUBYBoBiIUCEgYZrBFg
+RVIvBF8gw+89SRxh2i84dxGMYxo4CCCFDQZ02NtuSwcy+CGyWLmCUISsOgqPhh1hrC7FTfyxbQck
+BIf0AQhhDDvz+H87e40NpjTEuxwxjXy7QNnB5WHg9veuyo+n1+yQdAd7/p5/4H1AoV8v+h1cEwU5
+A2H6g93kGTvpNVrtucEE51vOY/OIHrQOAboLaDQKhW6Qg6grkVNborAM4Au9FS5sM+DGIo3rgCvT
+EqV3GA6nbxb8UQFUnHx3AV4AbwYMjBPZ+p5lxbL1e70FXeajnWCyeAWguzthmnxs1hn8vaBQHUfg
+ds4BiGQAhiEQebNGQtUrBLAmuGPAENyiA5U5QeY8DQbwXMmANLMrGzOeIbBg+gGCPX66CXu9gZAq
+MXnPP2bjjGW240l+Q0ifIZ9lvfi2mHXJXqtF0UedzgR6MlSeGOEsaqsV5M/lCfuCWqfe0coa/oHc
+QPM9nxfoO++/3ch+cEF+V3AF7WSqBgTBxDwEkoh7AXHC7FF4kvK+w+oNMwPYOPiySqBdB/K8NiRz
+EVwiEd7jnwBxyLMYwOslk34n1hadZEQU8jCQrG6CqqWZWkn7BbA576gphZQYncGSKZtViznfVfWI
+JYuPy18gXQWzh7QkCYERCG257EsjrwGj/J5qvWJ1PbSSdzzFqesiQ0yOON4Bbq4uwcClxOAS65nB
+r+yFoCMFpPyGLOUsQW9Iyg8wqG3dIZLjbrHLfQXybtpaHw28LdpLZXrBXJBUSJ4HhQC3E6iViRv+
+E4ZMo1nQZgTF1xq21YRXSkcc4L+8gMvMC7exwHHumNfmHA0FYqmxtvZrOi62iPL0tzO3lOg2HTvy
+lsl26+i46ZMtPDm4aYbXzmUe7vlCxpk0mnEl5EuMvXQj6gbbTThvzhBkrwRkK8eO20oyE2nMxWbt
+nRi4FZe7Aw1UUdN24McmuiAcA2iB1VWBnPb1BRVaXhhfmqgFcIVfYIgYnuz8AZIu0CEtgJ6QboX8
+AzQBfT00HzBwhLxCIYzLA5hXeIKERBkPSAqDs9fU4ewkiYkNA2prockzz9+++KcxF0IglwMh16Vv
+AGkNEDPLLhTN6msqdSU0QKud6uvSGjsSFaL+EvWlrSeyDtBsAoHgfBEyESCN4kLx7ArDx7AIh3ev
+2d4QoxYZMMhDfgQlUG4HWBo5IjXAWwQZo9Yef2AdwegIMITRzNh1RHsGIIoejsBOWWAZe2e69flQ
+uYAiQ5VcC5QPaIJgOjMG9IaEGQKBc9/c9CIgT7gRfavPTk/n4B5w1hMFIZAGQmSBgVB3pI3u0B3A
+9Je8lSw7OHvBcveCoWUiYiMkm7eh9JMRCEG5x9gUxJKo6E1gI7WP6fEAbEkWCANbA6fxrALggS+g
+iEmeH0i6AdGSfzdYOAsCo+VgGcO8SygW8pzng8lQWJHMvDLmDMwYBslBTh96zIGUiFKQ9wfpp+XG
+uISABxOsQbXpEBCVVrwC5KkFnDjKFIIYFIFHWE3hAUgQBlJ80WdrRDXPWclrV4Jgc3ldqEhFjJBx
+BwB7N5eIS6A9FtZmdrEE7MmMELcECwEJU9IJh0yCKdQhLKhYw3xBWev6JhgYSGGOs7ry/pSNaSiF
+HP648wZJkgykiRJNYAPzMFcc2qWcO3/XpqEGXcjpz+r436A93599F3UwMKT4/WcEQxBgW/9AUNIj
+VVjUJLBGAD0jxBTCEqTwqTjOwklBCnh1SYhs9yJJg6rBgEg+ZEeyQqMJTCmWSpxAuLADN+vgzI8Z
+gGo61q6whSk1MqCRNTJEoamSJ9QcQRkaTYx8ga0t/NiCgZAWoGkVSzi1MG02EzWxYQbmQqQRP5fh
++73gTB77xwdYQ9QOB2YF05/TMEiUglQawHAQvSyJB5wPcjS8zSBzZwYgMjNAFEJeixcISyghgsP0
+UYNIPCATK5gf1JEiM4dkwPdtyzJGEu3kB6/dcW/skONoqQ8ri4M4fGpHwn0BeIpEGsnBbEkX6vjf
+OktAku4D6zAqH7ebzrSIhqAz/FJORMIL5NCabyjIY94RDPH8PMEiy5dTO8z8MK1SOxJb+77mBeAs
+a0PvJVCB725QQlLDSiTtD7bkeY+8bbKATzikrg+lnnyoG4pK9IhtRENqTDRAuhIGNFlSSoSW7/4u
+5IpwoSEBdhhE