Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

glorious funtoo updates

merged:

  funtoo-overlay: 9d0e4f2
  foo-overlay: 7abd12c
  bar-overlay: f1e9085
  flora: 26fdc99
  mythtv: 2b2a5c3
  • Loading branch information...
commit 06d57497faeac32e4a4d8247c855fd0a65bb7367 1 parent 2442c59
Daniel Robbins authored December 16, 2012

Showing 272 changed files with 2,298 additions and 2,007 deletions. Show diff stats Hide diff stats

  1. 4  app-accessibility/at-spi2-core/metadata.xml
  2. 4  app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
  3. 2  app-arch/cpio/Manifest
  4. 35  app-arch/cpio/cpio-2.11-r1.ebuild
  5. 18  app-arch/cpio/files/cpio-2.11-non-gnu-compilers.patch
  6. 4  app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
  7. 4  app-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild
  8. 4  app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild
  9. 4  app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild
  10. 4  app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
  11. 4  app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild
  12. 4  app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild
  13. 1  app-misc/tracker/Manifest
  14. 24  app-misc/tracker/files/tracker-0.8.0-strigi.patch
  15. 26  app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
  16. 28  app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
  17. 61  app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
  18. 516  app-misc/tracker/files/tracker-0.8.17-use-upower.patch
  19. 1  app-misc/tracker/metadata.xml
  20. 11  app-misc/tracker/tracker-0.12.10-r1.ebuild
  21. 286  app-misc/tracker/tracker-0.14.2-r1.ebuild
  22. 11  app-misc/tracker/tracker-0.14.3.ebuild
  23. 12  app-misc/tracker/tracker-0.14.4.ebuild
  24. 10  app-misc/tracker/tracker-9999.ebuild
  25. 44  app-portage/demerge/demerge-0.047-r1.ebuild
  26. 1  app-portage/mirrorselect/Manifest
  27. 27  app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
  28. 92  app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
  29. 50  app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
  30. 52  app-portage/mirrorselect/mirrorselect-2.1.0-r2.ebuild
  31. 56  app-portage/mirrorselect/mirrorselect-2.2.0-r1.ebuild
  32. 4  app-portage/mirrorselect/mirrorselect-9999.ebuild
  33. 4  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/01_all_static_library_location.patch
  34. 6  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/02_all_disable_modules_and_ssl.patch
  35. 14  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/03_all_libdir.patch
  36. 2  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/04_all_non-zero_exit_status_on_failure.patch
  37. 8  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/05_all_regenerate_platform-specific_modules.patch
  38. 4  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/21_all_distutils_c++.patch
  39. 12  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/22_all_tests_environment.patch
  40. 0  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/23_all_h2py_encoding.patch
  41. 16  dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/61_all_process_data.patch
  42. 2  dev-lang/python/{python-2.7.4_pre20121118.ebuild → python-2.7.4_pre20121216.ebuild}
  43. 2  dev-lang/python/{python-3.2.4_pre20121118.ebuild → python-3.2.4_pre20121216.ebuild}
  44. 2  dev-lang/python/{python-3.3.1_pre20121118.ebuild → python-3.3.1_pre20121216.ebuild}
  45. 4  dev-lang/python/{python-3.4_pre20121118.ebuild → python-3.4_pre20121216.ebuild}
  46. 2  dev-lang/v8/Manifest
  47. 2  dev-lang/v8/{v8-3.15.1.2-r1.ebuild → v8-3.15.11.1.ebuild}
  48. 1  dev-libs/atk/Manifest
  49. 14  dev-libs/atk/atk-1.32.0-r1.ebuild
  50. 44  dev-libs/atk/atk-2.2.0.ebuild
  51. 14  dev-libs/atk/atk-2.4.0.ebuild
  52. 14  dev-libs/atk/atk-2.6.0.ebuild
  53. 4  dev-libs/atk/metadata.xml
  54. 1  dev-libs/opencryptoki/Manifest
  55. 26  dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
  56. 100  dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
  57. 54  dev-perl/PortageXS/PortageXS-0.02.10-r2.ebuild
  58. 77  dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
  59. 137  dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
  60. 1  dev-util/heroku/Manifest
  61. 38  dev-util/heroku/heroku-9999.ebuild
  62. 8  dev-util/heroku/metadata.xml
  63. 27  dev-util/heroku/metadata.xml~
  64. 1  dev-vcs/git-bz/Manifest
  65. 25  dev-vcs/git-bz/git-bz-0.12.12.15.ebuild
  66. 15  dev-vcs/git-bz/git-bz-9999.ebuild
  67. 22  eclass/python-utils-r1.eclass
  68. 1  games-engines/odamex/Manifest
  69. 204  games-engines/odamex/files/odamex-0.6.2-build.patch
  70. 96  games-engines/odamex/odamex-0.6.2.ebuild
  71. 4  games-fps/postal2mp-demo/Manifest
  72. 4  games-fps/postal2mp-demo/postal2mp-demo-1407-r1.ebuild
  73. 2  games-misc/gnurobots/Manifest
  74. 6  games-misc/gnurobots/gnurobots-1.2.0.ebuild
  75. 17  games-mud/minetest-mod/metadata.xml
  76. 1  games-mud/minetest/Manifest
  77. 18  games-mud/minetest/metadata.xml
  78. 2  games-mud/minetest/{minetest-0.4.3.ebuild → minetest-0.4.3-r1.ebuild}
  79. 1  games-mud/minetest/{minetest-9999.ebuild → minetest-9999-r1.ebuild}
  80. 2  gnome-extra/nautilus-sendto/metadata.xml
  81. 8  gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
  82. 8  gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
  83. 8  gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
  84. 1  gnome-extra/nautilus-tracker-tags/Manifest
  85. 43  gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.14.2.ebuild
  86. 4  media-fonts/source-pro/Manifest
  87. 6  media-fonts/source-pro/{source-pro-20121014.ebuild → source-pro-20121216.ebuild}
  88. 300  media-gfx/blender/blender-2.63a-r3.ebuild
  89. 4  media-libs/harfbuzz/harfbuzz-0.9.5.ebuild
  90. 15  media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch
  91. 6  media-libs/openimageio/openimageio-1.1.1.ebuild
  92. 2  media-plugins/grilo-plugins/Manifest
  93. 8  media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
  94. 8  media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
  95. 8  media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild
  96. 15  media-plugins/grilo-plugins/{grilo-plugins-0.2.3.ebuild → grilo-plugins-0.2.5.ebuild}
  97. 2  media-plugins/grilo-plugins/metadata.xml
  98. 1  media-sound/rhythmbox/Manifest
  99. 8  media-sound/rhythmbox/metadata.xml
  100. 13  media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
  101. 10  media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
  102. 173  media-sound/rhythmbox/rhythmbox-2.96.ebuild
  103. 10  media-sound/rhythmbox/rhythmbox-2.97.ebuild
  104. 10  media-sound/rhythmbox/rhythmbox-2.98.ebuild
  105. 2  metadata/dtd/timestamp.chk
  106. 2  metadata/glsa/timestamp.chk
  107. 2  metadata/md5-cache/app-admin/eclean-kernel-0.3.1
  108. 2  metadata/md5-cache/app-admin/eclean-kernel-0.3.2
  109. 2  metadata/md5-cache/app-admin/eclean-kernel-9999
  110. 6  metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
  111. 11  metadata/md5-cache/app-arch/cpio-2.11-r1
  112. 2  metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2
  113. 2  metadata/md5-cache/app-emulation/vmware-player-5.0.1.894247
  114. 2  metadata/md5-cache/app-emulation/vmware-workstation-9.0.1.894247
  115. 4  metadata/md5-cache/app-i18n/man-pages-ja-20070515
  116. 4  metadata/md5-cache/app-i18n/man-pages-ja-20101110
  117. 4  metadata/md5-cache/app-i18n/man-pages-ja-20101110-r1
  118. 4  metadata/md5-cache/app-i18n/man-pages-ja-20111020
  119. 8  metadata/md5-cache/app-misc/tracker-0.12.10-r1
  120. 16  metadata/md5-cache/app-misc/tracker-0.14.2-r1
  121. 8  metadata/md5-cache/app-misc/tracker-0.14.3
  122. 8  metadata/md5-cache/app-misc/tracker-0.14.4
  123. 8  metadata/md5-cache/app-misc/tracker-9999
  124. 10  metadata/md5-cache/app-portage/demerge-0.047-r1
  125. 2  metadata/md5-cache/app-portage/diffmask-0.3.3-r2
  126. 2  metadata/md5-cache/app-portage/diffmask-9999
  127. 2  metadata/md5-cache/app-portage/flaggie-0.2-r2
  128. 2  metadata/md5-cache/app-portage/flaggie-0.2-r3
  129. 2  metadata/md5-cache/app-portage/flaggie-9999
  130. 2  metadata/md5-cache/app-portage/gentoopm-0.2.6
  131. 2  metadata/md5-cache/app-portage/gentoopm-0.2.7
  132. 2  metadata/md5-cache/app-portage/gentoopm-9999
  133. 2  metadata/md5-cache/app-portage/install-mask-0.0.2-r2
  134. 2  metadata/md5-cache/app-portage/install-mask-9999
  135. 12  metadata/md5-cache/app-portage/mirrorselect-2.1.0-r1
  136. 12  metadata/md5-cache/app-portage/mirrorselect-2.1.0-r2
  137. 12  metadata/md5-cache/app-portage/mirrorselect-2.2.0-r1
  138. 2  metadata/md5-cache/app-portage/mirrorselect-9999
  139. 2  metadata/md5-cache/app-portage/smart-live-rebuild-1.2.5
  140. 2  metadata/md5-cache/app-portage/smart-live-rebuild-1.3
  141. 2  metadata/md5-cache/app-portage/smart-live-rebuild-9999
  142. 2  metadata/md5-cache/dev-embedded/bitbake-1.17.0
  143. 2  metadata/md5-cache/dev-embedded/bitbake-9999
  144. 2  metadata/md5-cache/dev-java/jython-2.5.3-r2
  145. 2  metadata/md5-cache/dev-lang/{python-2.7.4_pre20121118 → python-2.7.4_pre20121216}
  146. 2  metadata/md5-cache/dev-lang/{python-3.2.4_pre20121118 → python-3.2.4_pre20121216}
  147. 2  metadata/md5-cache/dev-lang/{python-3.3.1_pre20121118 → python-3.3.1_pre20121216}
  148. 2  metadata/md5-cache/dev-lang/{python-3.4_pre20121118 → python-3.4_pre20121216}
  149. 2  metadata/md5-cache/dev-lang/v8-3.14.5.1-r1
  150. 2  metadata/md5-cache/dev-lang/v8-3.14.5.2
  151. 8  metadata/md5-cache/dev-lang/{v8-3.15.1.2-r1 → v8-3.15.11.1}
  152. 2  metadata/md5-cache/dev-lang/v8-3.15.7.2
  153. 2  metadata/md5-cache/dev-lang/v8-9999
  154. 8  metadata/md5-cache/dev-libs/atk-1.32.0-r1
  155. 13  metadata/md5-cache/dev-libs/atk-2.2.0
  156. 8  metadata/md5-cache/dev-libs/atk-2.4.0
  157. 8  metadata/md5-cache/dev-libs/atk-2.6.0
  158. 14  metadata/md5-cache/dev-libs/opencryptoki-2.4.2
  159. 12  metadata/md5-cache/dev-perl/PortageXS-0.02.10-r2
  160. 2  metadata/md5-cache/dev-python/3to2-1.0
  161. 2  metadata/md5-cache/dev-python/cov-core-1.7
  162. 2  metadata/md5-cache/dev-python/jsonschema-0.7
  163. 2  metadata/md5-cache/dev-python/miniupnpc-1.7-r1
  164. 2  metadata/md5-cache/dev-python/pyGPG-9999
  165. 2  metadata/md5-cache/dev-python/pyatspi-2.6.0-r1
  166. 2  metadata/md5-cache/dev-python/pyh2o-9999
  167. 2  metadata/md5-cache/dev-python/pymountboot-0.2.1
  168. 2  metadata/md5-cache/dev-python/pymountboot-0.2.2
  169. 2  metadata/md5-cache/dev-python/pymountboot-9999
  170. 2  metadata/md5-cache/dev-python/pypy-1.8-r2
  171. 2  metadata/md5-cache/dev-python/pypy-1.9-r2
  172. 2  metadata/md5-cache/dev-python/pysctp-0.6
  173. 2  metadata/md5-cache/dev-python/pytest-cov-1.6
  174. 2  metadata/md5-cache/dev-python/python-exec-0.1
  175. 2  metadata/md5-cache/dev-python/python-exec-0.1.1
  176. 2  metadata/md5-cache/dev-python/python-exec-0.2
  177. 2  metadata/md5-cache/dev-python/python-exec-9999
  178. 2  metadata/md5-cache/dev-util/d-feet-0.1.15
  179. 2  metadata/md5-cache/dev-util/d-feet-0.3.1
  180. 2  metadata/md5-cache/dev-util/gdbus-codegen-2.34.2
  181. 2  metadata/md5-cache/dev-util/gdbus-codegen-2.34.3
  182. 8  metadata/md5-cache/dev-util/heroku-9999
  183. 2  metadata/md5-cache/dev-util/synopsis-0.13
  184. 13  metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
  185. 12  metadata/md5-cache/dev-vcs/git-bz-9999
  186. 13  metadata/md5-cache/games-engines/odamex-0.6.2
  187. 2  metadata/md5-cache/games-fps/postal2mp-demo-1407-r1
  188. 4  metadata/md5-cache/games-misc/gnurobots-1.2.0
  189. 6  metadata/md5-cache/games-mud/{minetest-0.4.3 → minetest-0.4.3-r1}
  190. 6  metadata/md5-cache/games-mud/{minetest-9999 → minetest-9999-r1}
  191. 2  metadata/md5-cache/games-util/pyfa-1.1.11
  192. 2  metadata/md5-cache/games-util/pyfa-1.1.12
  193. 2  metadata/md5-cache/gnome-extra/libgsf-1.14.25
  194. 8  metadata/md5-cache/gnome-extra/nautilus-sendto-2.32.0
  195. 8  metadata/md5-cache/gnome-extra/nautilus-sendto-3.0.2
  196. 8  metadata/md5-cache/gnome-extra/nautilus-sendto-3.0.3
  197. 12  metadata/md5-cache/gnome-extra/nautilus-tracker-tags-0.14.2
  198. 4  metadata/md5-cache/media-fonts/{source-pro-20121014 → source-pro-20121216}
  199. 14  metadata/md5-cache/media-gfx/blender-2.63a-r3
  200. 4  metadata/md5-cache/media-libs/harfbuzz-0.9.5
  201. 2  metadata/md5-cache/media-libs/openimageio-1.1.1
  202. 8  metadata/md5-cache/media-plugins/grilo-plugins-0.1.18
  203. 8  metadata/md5-cache/media-plugins/grilo-plugins-0.1.20
  204. 8  metadata/md5-cache/media-plugins/grilo-plugins-0.2.4
  205. 10  metadata/md5-cache/media-plugins/{grilo-plugins-0.2.3 → grilo-plugins-0.2.5}
  206. 2  metadata/md5-cache/media-plugins/quodlibet-plugins-2.4.91
  207. 2  metadata/md5-cache/media-sound/quodlibet-2.4.91
  208. 8  metadata/md5-cache/media-sound/rhythmbox-0.12.8-r1
  209. 8  metadata/md5-cache/media-sound/rhythmbox-0.13.3
  210. 14  metadata/md5-cache/media-sound/rhythmbox-2.96
  211. 6  metadata/md5-cache/media-sound/rhythmbox-2.97
  212. 6  metadata/md5-cache/media-sound/rhythmbox-2.98
  213. 11  metadata/md5-cache/net-analyzer/ettercap-9999
  214. 2  metadata/md5-cache/net-firewall/firewalld-0.2.9-r1
  215. 2  metadata/md5-cache/net-im/ekg2-0.3.1-r1
  216. 2  metadata/md5-cache/net-im/ekg2-9999
  217. 4  metadata/md5-cache/net-libs/libsrtp-1.4.4_p20121108
  218. 2  metadata/md5-cache/net-misc/flexget-1.0_beta3181
  219. 2  metadata/md5-cache/net-misc/flexget-9999
  220. 4  metadata/md5-cache/net-misc/quagga-0.99.21
  221. 2  metadata/md5-cache/net-proxy/hatop-0.7.7
  222. 2  metadata/md5-cache/net-wireless/{aircrack-ng-1.1-r1 → aircrack-ng-1.1-r2}
  223. 2  metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
  224. 4  metadata/md5-cache/sys-apps/{iproute2-3.5.1 → iproute2-3.5.1-r1}
  225. 4  metadata/md5-cache/sys-apps/{iproute2-3.6.0 → iproute2-3.6.0-r1}
  226. 4  metadata/md5-cache/sys-apps/{iproute2-3.7.0 → iproute2-3.7.0-r1}
  227. 11  metadata/md5-cache/sys-apps/rng-tools-4-r2
  228. 2  metadata/md5-cache/sys-apps/systemd-196
  229. 2  metadata/md5-cache/sys-apps/systemd-9999
  230. 8  metadata/md5-cache/sys-firmware/iwl5000-ucode-5.4.0.11
  231. 8  metadata/md5-cache/sys-firmware/iwl5000-ucode-8.83.5.1
  232. 10  metadata/md5-cache/sys-firmware/iwl5000-ucode-8.83.5.1-r1
  233. 2  metadata/md5-cache/sys-fs/loop-aes-3.6g
  234. 13  metadata/md5-cache/www-client/chromium-25.0.1349.2
  235. 13  metadata/md5-cache/www-client/chromium-25.0.1359.3
  236. 6  metadata/md5-cache/www-client/chromium-9999-r1
  237. 8  metadata/md5-cache/x11-libs/gdk-pixbuf-2.26.5
  238. 6  metadata/md5-cache/x11-misc/alacarte-0.13.2
  239. 6  metadata/md5-cache/x11-misc/alacarte-0.13.2-r50
  240. 2  metadata/news/timestamp.chk
  241. 2  metadata/timestamp
  242. 2  metadata/timestamp.chk
  243. 2  metadata/timestamp.x
  244. 59  net-analyzer/ettercap/ettercap-9999.ebuild
  245. 4  net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild
  246. 4  net-misc/quagga/quagga-0.99.21.ebuild
  247. 3  net-wireless/aircrack-ng/{aircrack-ng-1.1-r1.ebuild → aircrack-ng-1.1-r2.ebuild}
  248. 20  net-wireless/aircrack-ng/files/aircrack-ng-1.1-CVE-2010-1159.patch
  249. 6  profiles/base/package.use.mask
  250. 8  profiles/package.mask/funtoo-python
  251. 10  profiles/use.local.desc
  252. 8  sys-apps/iproute2/{iproute2-3.5.1.ebuild → iproute2-3.5.1-r1.ebuild}
  253. 9  sys-apps/iproute2/{iproute2-3.6.0.ebuild → iproute2-3.6.0-r1.ebuild}
  254. 7  sys-apps/iproute2/{iproute2-3.7.0.ebuild → iproute2-3.7.0-r1.ebuild}
  255. 3  sys-apps/iproute2/metadata.xml
  256. 2  sys-apps/rng-tools/Manifest
  257. 27  sys-apps/rng-tools/files/rngd-confd-4.1
  258. 32  sys-apps/rng-tools/files/rngd-initd-4.1
  259. 31  sys-apps/rng-tools/rng-tools-4-r2.ebuild
  260. 5  sys-firmware/iwl5000-ucode/Manifest
  261. 28  sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild
  262. 24  sys-firmware/iwl5000-ucode/{iwl5000-ucode-8.83.5.1.ebuild → iwl5000-ucode-8.83.5.1-r1.ebuild}
  263. 3  sys-fs/loop-aes/loop-aes-3.6g.ebuild
  264. 2  www-client/chromium/Manifest
  265. 94  www-client/chromium/{chromium-25.0.1349.2.ebuild → chromium-25.0.1359.3.ebuild}
  266. 60  www-client/chromium/chromium-9999-r1.ebuild
  267. 20  www-client/chromium/files/chromium-no-pnacl-r0.patch
  268. 12  x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
  269. 4  x11-libs/gdk-pixbuf/metadata.xml
  270. 2  x11-misc/alacarte/Manifest
  271. 6  x11-misc/alacarte/alacarte-0.13.2-r50.ebuild
  272. 6  x11-misc/alacarte/alacarte-0.13.2.ebuild
4  app-accessibility/at-spi2-core/metadata.xml
@@ -2,8 +2,4 @@
2 2
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3 3
 <pkgmetadata>
4 4
   <herd>gnome-accessibility</herd>
5  
-  <use>
6  
-	  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
7  
-		  for introspection</flag>
8  
-  </use>
9 5
 </pkgmetadata>
4  app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.2 2012/12/02 22:56:02 ssuominen Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.3 2012/12/15 21:46:53 tetromino Exp $
4 4
 
5 5
 EAPI=4
6 6
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="
32 32
 	dev-python/pycurl
33 33
 	>=dev-python/pygobject-2.21.5:2
34 34
 	net-print/cups[dbus]
35  
-	>=virtual/udev-171
  35
+	>=virtual/udev-172
36 36
 	virtual/libusb:1
37 37
 "
38 38
 DEPEND="${COMMON_DEPEND}
2  app-arch/cpio/Manifest
... ...
@@ -1 +1 @@
1  
-DIST cpio-2.11.tar.bz2 1018483 RMD160 52507b8ba556dca888ce1179cfda10f9549ea9ab SHA1 6f1934b0079dc1e85ddff89cabdf01adb3a74abb SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd
  1
+DIST cpio-2.11.tar.bz2 1018483 SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd SHA512 b6ccb3e121ea29780219d21c9cd6267c2f7b7ae72fb899bb80e1c54cc33e9eac5363443d93dbfbe37e8e8d295dad2724ac607f0543cc62797919605f68c396aa WHIRLPOOL 3e19212f8d5c16de0d531d189fa9fc288ff90d6299c1f3f98f61e182bb0ec278705ae5021c85c7aaeab869ad36b2b3bcd11327a746cde0bf5a596049d711d9cd
35  app-arch/cpio/cpio-2.11-r1.ebuild
... ...
@@ -0,0 +1,35 @@
  1
+# Copyright 1999-2012 Gentoo Foundation
  2
+# Distributed under the terms of the GNU General Public License v2
  3
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r1.ebuild,v 1.1 2012/12/16 03:24:37 ottxor Exp $
  4
+
  5
+EAPI="4"
  6
+
  7
+inherit eutils
  8
+
  9
+DESCRIPTION="A file archival tool which can also read and write tar files"
  10
+HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
  11
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
  12
+
  13
+LICENSE="GPL-3"
  14
+SLOT="0"
  15
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
  16
+IUSE="nls"
  17
+
  18
+src_prepare() {
  19
+	epatch "${FILESDIR}"/${P}-stat.patch #328531
  20
+	epatch "${FILESDIR}"/${P}-no-gets.patch #424974
  21
+	epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
  22
+}
  23
+
  24
+src_configure() {
  25
+	econf \
  26
+		$(use_enable nls) \
  27
+		--bindir="${EPREFIX}"/bin \
  28
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
  29
+}
  30
+
  31
+src_install() {
  32
+	default
  33
+	rm "${ED}"/usr/share/man/man1/mt.1 || die
  34
+	rmdir "${ED}"/usr/libexec || die
  35
+}
18  app-arch/cpio/files/cpio-2.11-non-gnu-compilers.patch
... ...
@@ -0,0 +1,18 @@
  1
+srcshelton@gmail.com: Patch for IRIX
  2
+
  3
+http://bugs.gentoo.org/show_bug.cgi?id=275295
  4
+
  5
+Sent upstream:
  6
+https://savannah.gnu.org/patch/?7838
  7
+
  8
+--- src/cpiohdr.h.dist  2009-06-24 15:41:26.983725240 +0100
  9
++++ src/cpiohdr.h       2009-06-24 15:41:59.753567720 +0100
  10
+@@ -24,6 +24,8 @@
  11
+
  12
+ #ifdef HAVE_ATTRIB_PACKED
  13
+ #define ATTRIB_PACKED __attribute__((packed))
  14
++#else
  15
++#define ATTRIB_PACKED
  16
+ #endif
  17
+
  18
+ #ifdef HAVE_PRAGMA_PACK
4  app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild,v 1.1 2012/12/11 18:07:17 grobian Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild,v 1.2 2012/12/16 04:24:25 mr_bones_ Exp $
4 4
 
5 5
 EAPI="3"
6 6
 
@@ -55,7 +55,7 @@ src_prepare() {
55 55
 
56 56
 src_configure() {
57 57
 	strip-flags
58  
-	
  58
+
59 59
 	local myconf
60 60
 
61 61
 	# Sound setup.
4  app-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild,v 1.1 2012/12/09 14:29:56 vadimk Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild,v 1.2 2012/12/16 04:24:49 mr_bones_ Exp $
4 4
 
5 5
 EAPI="4"
6 6
 
@@ -127,7 +127,7 @@ src_install() {
127 127
 	insinto "${VM_INSTALL_DIR}"/lib/vmware
128 128
 	doins -r lib/*
129 129
 
130  
-	# Bug 432918 
  130
+	# Bug 432918
131 131
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
132 132
 		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
133 133
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
4  app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild,v 1.1 2012/12/09 14:30:38 vadimk Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild,v 1.2 2012/12/16 04:25:15 mr_bones_ Exp $
4 4
 
5 5
 EAPI="4"
6 6
 
@@ -155,7 +155,7 @@ src_install() {
155 155
 	insinto "${VM_INSTALL_DIR}"/lib/vmware
156 156
 	doins -r lib/*
157 157
 
158  
-	# Bug 432918 
  158
+	# Bug 432918
159 159
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
160 160
 		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
161 161
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
4  app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild,v 1.5 2012/12/15 14:47:40 ulm Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild,v 1.6 2012/12/15 21:15:23 ulm Exp $
4 4
 
5 5
 GENTOO_MAN_P="portage-${PN}-20060415"
6 6
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.linux.or.jp/JM/ http://www.gentoo.gr.jp/jpmain/translation.
9 9
 SRC_URI="http://www.linux.or.jp/JM/${P}.tar.gz
10 10
 	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
11 11
 
12  
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
  12
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
13 13
 SLOT="0"
14 14
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
15 15
 IUSE=""
4  app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild,v 1.3 2012/12/15 21:15:23 ulm Exp $
4 4
 
5 5
 EAPI="3"
6 6
 GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
10 10
 SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
11 11
 	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
12 12
 
13  
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
  13
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
14 14
 SLOT="0"
15 15
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
16 16
 IUSE=""
4  app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild,v 1.3 2012/12/15 21:15:23 ulm Exp $
4 4
 
5 5
 EAPI="3"
6 6
 GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
10 10
 SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
11 11
 	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
12 12
 
13  
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
  13
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
14 14
 SLOT="0"
15 15
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
16 16
 IUSE=""
4  app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.3 2012/12/15 21:15:23 ulm Exp $
4 4
 
5 5
 EAPI="3"
6 6
 GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
10 10
 SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
11 11
 	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
12 12
 
13  
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
  13
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
14 14
 SLOT="0"
15 15
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
16 16
 IUSE=""
1  app-misc/tracker/Manifest
... ...
@@ -1,4 +1,3 @@
1 1
 DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
2  
-DIST tracker-0.14.2.tar.xz 5985464 SHA256 9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1 SHA512 204749a915e6e9af7057a0de7f8b5c317a56899dd5a9ca05c029ab1a3b47c42e54b3a86eb53c31fa21ad50abebed2b3a4e99008aac6cc23cb3bc9f7faa6504ff WHIRLPOOL 431a2b06e6906269795fd05e10bac912ffcc8d1ee0e5c394e178c5c12197ed6a05ec6ba939cf21946be0a17b84717405ad8b8be3d052b3f82c4d58999308cb07
3 2
 DIST tracker-0.14.3.tar.xz 6120108 SHA256 7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4 SHA512 c4c30ffc7879069c5487773e7a905b2b4bff811160318f0c46550ef27fa70b23d481234e62059900f8101e2ce19b3c52ee08f65020d98168c0ec31ca263c8663 WHIRLPOOL e8bf48887c0a6cb43accf399b14d6b6e8221bf261c035572791ef56ff8782d57f675e18b60bc9411f201c0311ab58503f5154fe296235cd262e63b9d338580ad
4 3
 DIST tracker-0.14.4.tar.xz 5946796 SHA256 b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 SHA512 e9d6d28276dc7f9930f0e8801fa3b3ea2a30ced0979309418ff5a36d7417ab85fb4d2c246032cad88ea63a4716b301db95a0046bd17eb1849e8a9a7edc464103 WHIRLPOOL 82aebbd0596c931867c65612672af52a510da202c881b2e1fdaa9a07136f8bef2840c2d0a6546ba0e6a53c9e61c973925dbc917ba5d8ec3b385f0656a34b926a
24  app-misc/tracker/files/tracker-0.8.0-strigi.patch
... ...
@@ -1,24 +0,0 @@
1  
-diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c tracker-0.8.0/src/tracker-extract/tracker-extract.c
2  
---- tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c	2010-04-02 11:56:16.643135323 +0200
3  
-+++ tracker-0.8.0/src/tracker-extract/tracker-extract.c	2010-04-02 14:22:51.650857844 +0200
4  
-@@ -150,7 +150,7 @@
5  
- 	                                   TRUE,
6  
- 	                                   sizeof (ModuleData));
7  
- 
8  
--#ifdef HAVE_LIBSTREAMANALYZER
9  
-+#if 0 /* disabling entirely since force_internal_extractors is not available here */
10  
- 	if (!force_internal_extractors) {
11  
- 		g_message ("Adding extractor for libstreamanalyzer");
12  
- 		g_message ("  Generic  match for ALL (tried first before our module)");
13  
-diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp
14  
---- tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp	2010-04-02 11:56:16.642114293 +0200
15  
-+++ tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp	2010-04-02 11:57:14.835861696 +0200
16  
-@@ -39,7 +39,7 @@
17  
- 
18  
- #include <libtracker-common/tracker-type-utils.h>
19  
- #include <libtracker-common/tracker-os-dependant.h>
20  
--#include <libtracker-common/tracker-sparql-builder.h>
21  
-+#include <libtracker-client/tracker-sparql-builder.h>
22  
- #include <libtracker-common/tracker-ontologies.h>
23  
- 
24  
- #include <libtracker-extract/tracker-utils.h>
26  app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
... ...
@@ -1,26 +0,0 @@
1  
-From 8db05ac879dcd7f0e10fb76563ba62512b932bb9 Mon Sep 17 00:00:00 2001
2  
-From: Gilles Dartiguelongue <eva@gentoo.org>
3  
-Date: Wed, 20 Oct 2010 14:32:19 +0200
4  
-Subject: [PATCH] gentoo: fix build with eds-2.32, cherry-picked from master
5  
-
6  
----
7  
- src/plugins/evolution/tracker-evolution-plugin.c |    2 ++
8  
- 1 files changed, 2 insertions(+), 0 deletions(-)
9  
-
10  
-diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
11  
-index 8e56d8d..991e525 100644
12  
---- a/src/plugins/evolution/tracker-evolution-plugin.c
13  
-+++ b/src/plugins/evolution/tracker-evolution-plugin.c
14  
-@@ -41,7 +41,9 @@
15  
- #include <sqlite3.h>
16  
- 
17  
- #include <camel/camel.h>
18  
-+#ifndef HAVE_EDS_2_31_2
19  
- #include <camel/camel-db.h>
20  
-+#endif
21  
- 
22  
- #include <mail/mail-config.h>
23  
- #include <mail/mail-session.h>
24  
--- 
25  
-1.7.3.1
26  
-
28  app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
... ...
@@ -1,28 +0,0 @@
1  
---- tracker-0.8.17/configure.ac~	2010-09-02 16:26:20.000000000 +0200
2  
-+++ tracker-0.8.17/configure.ac	2010-12-29 11:51:10.848878668 +0100
3  
-@@ -1150,6 +1150,11 @@
4  
- 	      [enable_poppler_glib=auto])
5  
- 
6  
- if test "x$enable_poppler_glib" != "xno" ; then
7  
-+   PKG_CHECK_EXISTS([poppler-glib >= 0.16], [have_poppler_0_16_0=yes])
8  
-+   if test "x$have_poppler_0_16_0" = "xyes"; then
9  
-+	   AC_DEFINE([HAVE_POPPLER_0_16_0], [1], [Define to 1 if you have Poppler version 0.16.0 or higher.])
10  
-+   fi
11  
-+
12  
-    PKG_CHECK_MODULES(POPPLER_GLIB,
13  
-    		     [poppler-glib >= $POPPLER_GLIB_REQUIRED],
14  
- 		     [have_poppler_glib=yes],
15  
---- tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c~	2010-09-02 14:51:00.000000000 +0200
16  
-+++ tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c	2010-12-29 11:55:36.165545335 +0100
17  
-@@ -243,7 +243,11 @@
18  
- 		rect.x1 = rect.y1 = 0;
19  
- 		poppler_page_get_size (page, &rect.x2, &rect.y2);
20  
- 
21  
-+#if defined (HAVE_POPPLER_0_16_0)
22  
-+		text = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
23  
-+#else
24  
- 		text = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
25  
-+#endif
26  
- 		t = tracker_text_normalize (text, n_words - words, &normalized_words);
27  
- 
28  
- 		words += normalized_words;
61  app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
... ...
@@ -1,61 +0,0 @@
1  
-From c1d19b6060bcf5c70ea1bf6eed9bb07583506f6d Mon Sep 17 00:00:00 2001
2  
-From: Gilles Dartiguelongue <eva@gentoo.org>
3  
-Date: Wed, 22 Dec 2010 12:46:40 +0100
4  
-Subject: [PATCH 3/3] gentoo: tests apps are not named lt-*
5  
-
6  
----
7  
- tests/libtracker-common/tracker-dbus-test.c |   10 +++++-----
8  
- 1 files changed, 5 insertions(+), 5 deletions(-)
9  
-
10  
-diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c
11  
-index c029eb4..245e2d7 100644
12  
---- a/tests/libtracker-common/tracker-dbus-test.c
13  
-+++ b/tests/libtracker-common/tracker-dbus-test.c
14  
-@@ -327,7 +327,7 @@ test_dbus_request_client_lookup ()
15  
-         }
16  
-         g_test_trap_assert_passed ();
17  
-         g_test_trap_assert_stdout ("*TestNewOK*");
18  
--        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
19  
-+        g_test_trap_assert_stdout ("*tracker-dbus*");
20  
- 
21  
-         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
22  
-                 tracker_dbus_request_comment (request_id, context, 
23  
-@@ -336,7 +336,7 @@ test_dbus_request_client_lookup ()
24  
-         }
25  
-         g_test_trap_assert_passed ();
26  
-         g_test_trap_assert_stderr ("*TestCommentOK*");
27  
--        g_test_trap_assert_stderr ("*lt-tracker-dbus*");
28  
-+        g_test_trap_assert_stderr ("*tracker-dbus*");
29  
- 
30  
- 
31  
-         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
32  
-@@ -346,7 +346,7 @@ test_dbus_request_client_lookup ()
33  
-         }
34  
-         g_test_trap_assert_passed ();
35  
-         g_test_trap_assert_stdout ("*TestInfoOK*");
36  
--        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
37  
-+        g_test_trap_assert_stdout ("*tracker-dbus*");
38  
- 
39  
-         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
40  
-                 tracker_dbus_request_debug (request_id, context, 
41  
-@@ -355,7 +355,7 @@ test_dbus_request_client_lookup ()
42  
-         }
43  
-         g_test_trap_assert_passed ();
44  
-         g_test_trap_assert_stdout ("*TestDebugOK*");
45  
--        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
46  
-+        g_test_trap_assert_stdout ("*tracker-dbus*");
47  
- 
48  
-         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
49  
-                 tracker_dbus_request_success (request_id, context);
50  
-@@ -363,7 +363,7 @@ test_dbus_request_client_lookup ()
51  
-         }
52  
-         g_test_trap_assert_passed ();
53  
-         g_test_trap_assert_stdout ("*Success*");
54  
--        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
55  
-+        g_test_trap_assert_stdout ("*tracker-dbus*");
56  
- 
57  
-         /* Force client shutdown */
58  
-         tracker_dbus_enable_client_lookup (FALSE);
59  
--- 
60  
-1.7.3.4
61  
-
516  app-misc/tracker/files/tracker-0.8.17-use-upower.patch
... ...
@@ -1,516 +0,0 @@
1  
-From 16a8576cb8e06de02f366002464709797aa92050 Mon Sep 17 00:00:00 2001
2  
-From: Michael Biebl <biebl@debian.org>
3  
-Date: Wed, 14 Apr 2010 03:49:31 +0200
4  
-Subject: [PATCH 2/3] gentoo: port from libdevkit-power-gobject to libupower-glib
5  
-
6  
-Squashed from 0.9 series commits:
7  
- * 0476409b069a8a23f6829af1365426c1d8385d91
8  
- * cfa8dcbcbea9b80ca27636532fb38fbf5d08a110
9  
- * 8099bdd7c8409e7819864b4b7e315fd99383041f
10  
----
11  
- configure.ac                                    |   54 +++---
12  
- src/libtracker-common/Makefile.am               |   11 +-
13  
- src/libtracker-common/tracker-power-devicekit.c |  247 -----------------------
14  
- src/libtracker-common/tracker-power-upower.c    |  247 +++++++++++++++++++++++
15  
- src/miners/fs/tracker-miner-files.c             |   24 +-
16  
- 5 files changed, 291 insertions(+), 292 deletions(-)
17  
- delete mode 100644 src/libtracker-common/tracker-power-devicekit.c
18  
- create mode 100644 src/libtracker-common/tracker-power-upower.c
19  
-
20  
-diff --git a/configure.ac b/configure.ac
21  
-index 4f1ebc4..7c8b284 100644
22  
---- a/configure.ac
23  
-+++ b/configure.ac
24  
-@@ -139,7 +139,7 @@ GTK_REQUIRED=2.18.0
25  
- LIBXML2_REQUIRED=2.6
26  
- LIBNOTIFY_REQUIRED=0.4.3
27  
- HAL_REQUIRED=0.5
28  
--DEVKIT_POWER_REQUIRED=007
29  
-+UPOWER_REQUIRED=0.9.0
30  
- GDKPIXBUF_REQUIRED=2.12.0
31  
- QUILL_REQUIRED=1.0.0
32  
- UNAC_REQUIRED=1.0.0
33  
-@@ -422,36 +422,36 @@ fi
34  
- 
35  
- 
36  
- ##################################################################
37  
--# Check for DeviceKit-power
38  
-+# Check for UPower
39  
- ##################################################################
40  
- 
41  
--AC_ARG_ENABLE(devkit_power,
42  
--	      AS_HELP_STRING([--disable-devkit-power],
43  
--			     [disable DeviceKit-power support for AC power detection [[default=auto]]]),,
44  
--	      [enable_devkit_power=auto])
45  
--
46  
--if test "x$enable_devkit_power" != "xno"; then
47  
--   PKG_CHECK_MODULES(DEVKIT_POWER,
48  
--		     [devkit-power-gobject >= $DEVKIT_POWER_REQUIRED],
49  
--		     [have_devkit_power=yes] ,
50  
--		     [have_devkit_power=no])
51  
--   AC_SUBST(DEVKIT_POWER_CFLAGS)
52  
--   AC_SUBST(DEVKIT_POWER_LIBS)
53  
--
54  
--   if test "x$have_devkit_power" = "xyes"; then
55  
--      AC_DEFINE(HAVE_DEVKIT_POWER, [], [Define if we have DEVKIT_POWER])
56  
-+AC_ARG_ENABLE(upower,
57  
-+	      AS_HELP_STRING([--disable-upower],
58  
-+			     [disable UPower support for AC power detection [[default=auto]]]),,
59  
-+	      [enable_upower=auto])
60  
-+
61  
-+if test "x$enable_upower" != "xno"; then
62  
-+   PKG_CHECK_MODULES(UPOWER,
63  
-+		     [upower-glib >= $UPOWER_REQUIRED],
64  
-+		     [have_upower=yes] ,
65  
-+		     [have_upower=no])
66  
-+   AC_SUBST(UPOWER_CFLAGS)
67  
-+   AC_SUBST(UPOWER_LIBS)
68  
-+
69  
-+   if test "x$have_upower" = "xyes"; then
70  
-+      AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPOWER])
71  
-    fi
72  
- else
73  
--   have_devkit_power="no  (disabled)"
74  
-+   have_upower="no  (disabled)"
75  
- fi
76  
- 
77  
--if test "x$enable_devkit_power" = "xyes"; then
78  
--   if test "x$have_devkit_power" != "xyes"; then
79  
--      AC_MSG_ERROR([Couldn't find devkit_power >= $DEVKIT_POWER_REQUIRED.])
80  
-+if test "x$enable_upower" = "xyes"; then
81  
-+   if test "x$have_upower" != "xyes"; then
82  
-+      AC_MSG_ERROR([Couldn't find upower >= $UPOWER_REQUIRED.])
83  
-    fi
84  
- fi
85  
- 
86  
--AM_CONDITIONAL(HAVE_DEVKIT_POWER, test "x$have_devkit_power" = "xyes")
87  
-+AM_CONDITIONAL(HAVE_UPOWER, test "x$have_upower" = "xyes")
88  
- 
89  
- ##################################################################
90  
- # Check for HAL
91  
-@@ -462,7 +462,7 @@ AC_ARG_ENABLE(hal,
92  
- 			     [disable HAL support for AC power detection [[default=auto]]]),,
93  
- 	      [enable_hal=auto])
94  
- 
95  
--if test "x$have_devkit_power" != "xyes" && test "x$enable_hal" != "xno"; then
96  
-+if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
97  
-    PKG_CHECK_MODULES(HAL,
98  
-                      [hal >= $HAL_REQUIRED],
99  
- 		     [have_hal=yes] ,
100  
-@@ -478,8 +478,8 @@ else
101  
- fi
102  
- 
103  
- if test "x$enable_hal" = "xyes"; then
104  
--   if test "x$have_devkit_power" = "xyes"; then
105  
--      AC_MSG_ERROR([Only one of DeviceKit-power and HAL can be used.])
106  
-+   if test "x$have_upower" = "xyes"; then
107  
-+      AC_MSG_ERROR([Only one of UPower and HAL can be used.])
108  
-    elif test "x$have_hal" != "xyes"; then
109  
-       AC_MSG_ERROR([Couldn't find hal >= $HAL_REQUIRED.])
110  
-    fi
111  
-@@ -1797,8 +1797,8 @@ Build Configuration:
112  
- 	Enable unit tests:			$have_unit_tests
113  
- 
114  
- 	Support for ioprio:			$tracker_cv_have_ioprio
115  
--	Support for HAL:                    	$have_hal
116  
--	Support for DeviceKit-power:           	$have_devkit_power
117  
-+	Support for HAL:			$have_hal
118  
-+	Support for UPower:			$have_upower
119  
- 	Support for file monitoring:            $have_file_monitor
120  
- 	Support for accent stripping (unac):  	$have_unac
121  
- 	Support for Cyrillic languages (enca): 	$have_enca
122  
-diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
123  
-index 5a3d33e..555fcff 100644
124  
---- a/src/libtracker-common/Makefile.am
125  
-+++ b/src/libtracker-common/Makefile.am
126  
-@@ -4,14 +4,13 @@ INCLUDES =						\
127  
- 	-DSHAREDIR=\""$(datadir)"\"			\
128  
- 	-DG_LOG_DOMAIN=\"Tracker\"			\
129  
- 	-DTRACKER_COMPILATION				\
130  
--	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE	\
131  
- 	-I$(top_srcdir)/src				\
132  
- 	$(WARN_CFLAGS)					\
133  
- 	$(GLIB2_CFLAGS)					\
134  
- 	$(GCOV_CFLAGS)					\
135  
- 	$(GIO_CFLAGS)					\
136  
- 	$(HAL_CFLAGS)					\
137  
--	$(DEVKIT_POWER_CFLAGS)				\
138  
-+	$(UPOWER_CFLAGS)				\
139  
- 	$(DBUS_CFLAGS)
140  
- 
141  
- libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
142  
-@@ -23,12 +22,12 @@ else
143  
- os_sources = tracker-os-dependant-unix.c
144  
- endif
145  
- 
146  
--# Prefer DeviceKit-power for the power data if it's available, else fall back to HAL
147  
--if HAVE_DEVKIT_POWER
148  
-+# Prefer UPower for the power data if it's available, else fall back to HAL
149  
-+if HAVE_UPOWER
150  
- power_headers =						\
151  
- 	tracker-power.h
152  
- power_sources =						\
153  
--	tracker-power-devicekit.c
154  
-+	tracker-power-upower.c
155  
- else
156  
- if HAVE_HAL
157  
- power_headers =						\
158  
-@@ -77,7 +76,7 @@ libtracker_common_la_LDFLAGS = 				\
159  
- libtracker_common_la_LIBADD = 				\
160  
- 	$(top_builddir)/src/libstemmer/libstemmer.la	\
161  
- 	$(HAL_LIBS)					\
162  
--	$(DEVKIT_POWER_LIBS)				\
163  
-+	$(UPOWER_LIBS)					\
164  
- 	$(DBUS_LIBS)					\
165  
- 	$(GIO_LIBS)					\
166  
- 	$(GCOV_LIBS)					\
167  
-diff --git a/src/libtracker-common/tracker-power-devicekit.c b/src/libtracker-common/tracker-power-devicekit.c
168  
-deleted file mode 100644
169  
-index 4022302..0000000
170  
-
171  
-Hunk removed to avoid 20k patch size limit.
172  
-
173  
-diff --git a/src/libtracker-common/tracker-power-upower.c b/src/libtracker-common/tracker-power-upower.c
174  
-new file mode 100644
175  
-index 0000000..8a1b71e
176  
---- /dev/null
177  
-+++ b/src/libtracker-common/tracker-power-upower.c
178  
-@@ -0,0 +1,247 @@
179  
-+/*
180  
-+ * Copyright (C) 2006, Jamie McCracken <jamiemcc@gnome.org>
181  
-+ * Copyright (C) 2008, Nokia <ivan.frade@nokia.com>
182  
-+ *
183  
-+ * This library is free software; you can redistribute it and/or
184  
-+ * modify it under the terms of the GNU Lesser General Public
185  
-+ * License as published by the Free Software Foundation; either
186  
-+ * version 2.1 of the License, or (at your option) any later version.
187  
-+ *
188  
-+ * This library is distributed in the hope that it will be useful,
189  
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
190  
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
191  
-+ * Lesser General Public License for more details.
192  
-+ *
193  
-+ * You should have received a copy of the GNU Lesser General Public
194  
-+ * License along with this library; if not, write to the
195  
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
196  
-+ * Boston, MA  02110-1301, USA.
197  
-+ */
198  
-+
199  
-+#include "config.h"
200  
-+
201  
-+#ifdef HAVE_UPOWER
202  
-+
203  
-+#include <upower.h>
204  
-+
205  
-+#include "tracker-power.h"
206  
-+
207  
-+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_POWER, TrackerPowerPriv))
208  
-+
209  
-+typedef struct {
210  
-+	UpClient  *client;
211  
-+	gboolean   on_battery;
212  
-+	gboolean   on_low_battery;
213  
-+} TrackerPowerPriv;
214  
-+
215  
-+static void     tracker_power_finalize          (GObject         *object);
216  
-+static void     tracker_power_get_property      (GObject         *object,
217  
-+                                                 guint            param_id,
218  
-+                                                 GValue                  *value,
219  
-+                                                 GParamSpec      *pspec);
220  
-+static void     tracker_power_client_changed_cb (UpClient        *client,
221  
-+                                                 TrackerPower    *power);
222  
-+
223  
-+enum {
224  
-+	PROP_0,
225  
-+	PROP_ON_BATTERY,
226  
-+	PROP_ON_LOW_BATTERY,
227  
-+	PROP_BATTERY_PERCENTAGE
228  
-+};
229  
-+
230  
-+G_DEFINE_TYPE (TrackerPower, tracker_power, G_TYPE_OBJECT);
231  
-+
232  
-+static void
233  
-+tracker_power_class_init (TrackerPowerClass *klass)
234  
-+{
235  
-+	GObjectClass *object_class;
236  
-+
237  
-+	object_class = G_OBJECT_CLASS (klass);
238  
-+
239  
-+	object_class->finalize     = tracker_power_finalize;
240  
-+	object_class->get_property = tracker_power_get_property;
241  
-+
242  
-+	g_object_class_install_property (object_class,
243  
-+	                                 PROP_ON_BATTERY,
244  
-+	                                 g_param_spec_boolean ("on-battery",
245  
-+	                                                       "Battery in use",
246  
-+	                                                       "Whether the battery is being used",
247  
-+	                                                       FALSE,
248  
-+	                                                       G_PARAM_READABLE));
249  
-+
250  
-+	g_object_class_install_property (object_class,
251  
-+	                                 PROP_ON_LOW_BATTERY,
252  
-+	                                 g_param_spec_boolean ("on-low-battery",
253  
-+	                                                       "Battery low",
254  
-+	                                                       "Whether the battery is low",
255  
-+	                                                       FALSE,
256  
-+	                                                       G_PARAM_READABLE));
257  
-+	g_object_class_install_property (object_class,
258  
-+	                                 PROP_BATTERY_PERCENTAGE,
259  
-+	                                 g_param_spec_double ("battery-percentage",
260  
-+	                                                      "Battery percentage",
261  
-+	                                                      "Current battery percentage left",
262  
-+	                                                      0.0,
263  
-+	                                                      1.0,
264  
-+	                                                      0.0,
265  
-+	                                                      G_PARAM_READABLE));
266  
-+
267  
-+	g_type_class_add_private (object_class, sizeof (TrackerPowerPriv));
268  
-+}
269  
-+
270  
-+static void
271  
-+tracker_power_init (TrackerPower *power)
272  
-+{
273  
-+	TrackerPowerPriv *priv;
274  
-+
275  
-+	g_message ("Initializing UPower...");
276  
-+
277  
-+	priv = GET_PRIV (power);
278  
-+
279  
-+	/* connect to a UPower instance */
280  
-+	priv->client = up_client_new ();
281  
-+	g_signal_connect (priv->client, "changed",
282  
-+	                  G_CALLBACK (tracker_power_client_changed_cb), power);
283  
-+
284  
-+	/* coldplug */
285  
-+	priv->on_battery = up_client_get_on_battery (priv->client);
286  
-+	priv->on_low_battery = up_client_get_on_low_battery (priv->client);
287  
-+}
288  
-+
289  
-+static void
290  
-+tracker_power_finalize (GObject *object)
291  
-+{
292  
-+	TrackerPowerPriv *priv;
293  
-+
294  
-+	priv = GET_PRIV (object);
295  
-+
296  
-+	g_object_unref (priv->client);
297  
-+
298  
-+	(G_OBJECT_CLASS (tracker_power_parent_class)->finalize) (object);
299  
-+}
300  
-+
301  
-+static void
302  
-+tracker_power_get_property (GObject    *object,
303  
-+                            guint       param_id,
304  
-+                            GValue     *value,
305  
-+                            GParamSpec *pspec)
306  
-+{
307  
-+	TrackerPowerPriv *priv;
308  
-+
309  
-+	priv = GET_PRIV (object);
310  
-+
311  
-+	switch (param_id) {
312  
-+	case PROP_ON_BATTERY:
313  
-+		g_value_set_boolean (value, priv->on_battery);
314  
-+		break;
315  
-+	case PROP_ON_LOW_BATTERY:
316  
-+		g_value_set_boolean (value, priv->on_low_battery);
317  
-+		break;
318  
-+	default:
319  
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
320  
-+		break;
321  
-+	};
322  
-+}
323  
-+
324  
-+/**
325  
-+ * tracker_power_client_changed_cb:
326  
-+ **/
327  
-+static void
328  
-+tracker_power_client_changed_cb (UpClient *client, TrackerPower *power)
329  
-+{
330  
-+	gboolean on_battery;
331  
-+	gboolean on_low_battery;
332  
-+	TrackerPowerPriv *priv;
333  
-+
334  
-+	priv = GET_PRIV (power);
335  
-+
336  
-+	/* get the on-battery state */
337  
-+	on_battery = up_client_get_on_battery (priv->client);
338  
-+	if (on_battery != priv->on_battery) {
339  
-+		priv->on_battery = on_battery;
340  
-+		g_object_notify (G_OBJECT (power), "on-battery");
341  
-+	}
342  
-+
343  
-+	/* get the on-low-battery state */
344  
-+	on_low_battery = up_client_get_on_low_battery (priv->client);
345  
-+	if (on_low_battery != priv->on_low_battery) {
346  
-+		priv->on_low_battery = on_low_battery;
347  
-+		g_object_notify (G_OBJECT (power), "on-low-battery");
348  
-+	}
349  
-+}
350  
-+
351  
-+/**
352  
-+ * tracker_power_new:
353  
-+ *
354  
-+ * Creates a new instance of #TrackerPower.
355  
-+ *
356  
-+ * Returns: The newly created #TrackerPower.
357  
-+ **/
358  
-+TrackerPower *
359  
-+tracker_power_new ()
360  
-+{
361  
-+	return g_object_new (TRACKER_TYPE_POWER, NULL);
362  
-+}
363  
-+
364  
-+/**
365  
-+ * tracker_power_get_on_battery:
366  
-+ * @power: A #TrackerPower.
367  
-+ *
368  
-+ * Returns whether the computer battery (if any) is currently in use.
369  
-+ *
370  
-+ * Returns: #TRUE if the computer is running on battery power.
371  
-+ **/
372  
-+gboolean
373  
-+tracker_power_get_on_battery (TrackerPower *power)
374  
-+{
375  
-+	TrackerPowerPriv *priv;
376  
-+
377  
-+	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
378  
-+
379  
-+	priv = GET_PRIV (power);
380  
-+
381  
-+	return priv->on_battery;
382  
-+}
383  
-+
384  
-+/**
385  
-+ * tracker_power_get_on_low_battery:
386  
-+ * @power: A #TrackerPower
387  
-+ *
388  
-+ * Returns whether the computer has batteries.
389  
-+ *
390  
-+ * Returns: #TRUE if the computer has batteries available.
391  
-+ **/
392  
-+gboolean
393  
-+tracker_power_get_on_low_battery (TrackerPower *power)
394  
-+{
395  
-+	TrackerPowerPriv *priv;
396  
-+
397  
-+	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
398  
-+
399  
-+	priv = GET_PRIV (power);
400  
-+
401  
-+	return priv->on_low_battery;
402  
-+}
403  
-+
404  
-+/**
405  
-+ * tracker_power_get_battery_percentage:
406  
-+ * @power: A #TrackerPower
407  
-+ *
408  
-+ * Returns the percentage of battery power available.
409  
-+ *
410  
-+ * Returns: #gdouble representing the percentage between 0.0 and 1.0.
411  
-+ **/
412  
-+gdouble
413  
-+tracker_power_get_battery_percentage (TrackerPower *power)
414  
-+{
415  
-+	TrackerPowerPriv *priv;
416  
-+
417  
-+	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
418  
-+
419  
-+	priv = GET_PRIV (power);
420  
-+
421  
-+	/* FIXME: Implement */
422  
-+	return 0.5;
423  
-+}
424  
-+
425  
-+#endif /* HAVE_UPOWER */
426  
-diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
427  
-index 86364ab..6732364 100644
428  
---- a/src/miners/fs/tracker-miner-files.c
429  
-+++ b/src/miners/fs/tracker-miner-files.c
430  
-@@ -76,9 +76,9 @@ struct TrackerMinerFilesPrivate {
431  
- 
432  
- 	guint low_battery_pause_cookie;
433  
- 
434  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
435  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
436  
- 	TrackerPower *power;
437  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
438  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
439  
- 	gulong finished_handler;
440  
- 
441  
- 	DBusGProxy *extractor_proxy;
442  
-@@ -225,7 +225,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
443  
- 	                  G_CALLBACK (mount_point_removed_cb),
444  
- 	                  mf);
445  
- 
446  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
447  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
448  
- 	priv->power = tracker_power_new ();
449  
- 
450  
- 	g_signal_connect (priv->power, "notify::on-low-battery",
451  
-@@ -234,7 +234,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
452  
- 	g_signal_connect (priv->power, "notify::on-battery",
453  
- 	                  G_CALLBACK (battery_status_cb),
454  
- 	                  mf);
455  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
456  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
457  
- 
458  
- 	priv->finished_handler = g_signal_connect_after (mf, "finished",
459  
- 							 G_CALLBACK (miner_finished_cb),
460  
-@@ -323,9 +323,9 @@ miner_files_finalize (GObject *object)
461  
-                 g_slist_free (priv->index_single_directories);
462  
-         }
463  
- 
464  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
465  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
466  
- 	g_object_unref (priv->power);
467  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
468  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
469  
- 
470  
- 	g_object_unref (priv->storage);
471  
- 
472  
-@@ -375,9 +375,9 @@ miner_files_constructed (GObject *object)
473  
- 
474  
- 	mounts = tracker_storage_get_device_roots (mf->private->storage, type, TRUE);
475  
- 
476  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
477  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
478  
- 	check_battery_status (mf);
479  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
480  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
481  
- 
482  
- 	g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
483  
- 
484  
-@@ -988,7 +988,7 @@ mount_point_added_cb (TrackerStorage *storage,
485  
- 	g_free (urn);
486  
- }
487  
- 
488  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
489  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
490  
- 
491  
- static void
492  
- set_up_throttle (TrackerMinerFiles *mf,
493  
-@@ -1092,7 +1092,7 @@ index_on_battery_cb (GObject    *object,
494  
- 	check_battery_status (mf);
495  
- }
496  
- 
497  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
498  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
499  
- 
500  
- /* Called when mining has finished the first time */
501  
- static void
502  
-@@ -1118,9 +1118,9 @@ miner_finished_cb (TrackerMinerFS *fs,
503  
- 		mf->private->finished_handler = 0;
504  
- 	}
505  
- 
506  
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
507  
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
508  
- 	check_battery_status (mf);
509  
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
510  
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
511  
- }
512  
- 
513  
- static void
514  
--- 
515  
-1.7.3.4
516  
-
1  app-misc/tracker/metadata.xml
@@ -24,7 +24,6 @@
24 24
   <flag name="thunderbird">Install email data miner plugin for
25 25
     <pkg>mail-client/thunderbird</pkg> and
26 26
 	<pkg>mail-client/thunderbird-bin</pkg></flag>
27  
-  <flag name="upnp">Add support for video extraction via <pkg>media-libs/gupnp-dlna</pkg>.</flag>
28 27
   <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
29 28
 </use>
30 29
 </pkgmetadata>
11  app-misc/tracker/tracker-0.12.10-r1.ebuild
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2012 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3  
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.3 2012/10/25 18:40:42 eva Exp $
  3
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.4 2012/12/15 19:01:29 tetromino Exp $
4 4
 
5 5
 EAPI="4"
6 6
 GCONF_DEBUG="no"
@@ -16,7 +16,8 @@ LICENSE="GPL-2+ LGPL-2.1+"
16 16
 SLOT="0"
17 17
 KEYWORDS="~amd64 ~x86"
18 18
 # USE="doc" is managed by eclass.
19  
-IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
  19
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
  20
+gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi