Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 9d0e4f2df857c31fbf7832806ae8ef41d0265350
  foo-overlay: 7abd12c02cc8583ee9d93528a3ff472c70c49978
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 26fdc99b6aa4d30cf542553b0d1f3a97b6ee6e99
  mythtv: 2b2a5c370353a5d4d3976410d935cba8c2dc3431
  • Loading branch information...
1 parent 2442c59 commit 06d57497faeac32e4a4d8247c855fd0a65bb7367 @danielrobbins danielrobbins committed Dec 16, 2012
Showing with 2,298 additions and 2,007 deletions.
  1. +0 −4 app-accessibility/at-spi2-core/metadata.xml
  2. +2 −2 app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
  3. +1 −1 app-arch/cpio/Manifest
  4. +35 −0 app-arch/cpio/cpio-2.11-r1.ebuild
  5. +18 −0 app-arch/cpio/files/cpio-2.11-non-gnu-compilers.patch
  6. +2 −2 app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
  7. +2 −2 app-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild
  8. +2 −2 app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild
  9. +2 −2 app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild
  10. +2 −2 app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
  11. +2 −2 app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild
  12. +2 −2 app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild
  13. +0 −1 app-misc/tracker/Manifest
  14. +0 −24 app-misc/tracker/files/tracker-0.8.0-strigi.patch
  15. +0 −26 app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
  16. +0 −28 app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
  17. +0 −61 app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
  18. +0 −516 app-misc/tracker/files/tracker-0.8.17-use-upower.patch
  19. +0 −1 app-misc/tracker/metadata.xml
  20. +6 −5 app-misc/tracker/tracker-0.12.10-r1.ebuild
  21. +0 −286 app-misc/tracker/tracker-0.14.2-r1.ebuild
  22. +6 −5 app-misc/tracker/tracker-0.14.3.ebuild
  23. +5 −7 app-misc/tracker/tracker-0.14.4.ebuild
  24. +5 −5 app-misc/tracker/tracker-9999.ebuild
  25. +44 −0 app-portage/demerge/demerge-0.047-r1.ebuild
  26. +1 −0 app-portage/mirrorselect/Manifest
  27. +27 −0 app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
  28. +92 −0 app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
  29. +0 −50 app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
  30. +0 −52 app-portage/mirrorselect/mirrorselect-2.1.0-r2.ebuild
  31. +56 −0 app-portage/mirrorselect/mirrorselect-2.2.0-r1.ebuild
  32. +2 −2 app-portage/mirrorselect/mirrorselect-9999.ebuild
  33. +2 −2 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/01_all_static_library_location.patch
  34. +3 −3 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/02_all_disable_modules_and_ssl.patch
  35. +7 −7 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/03_all_libdir.patch
  36. +1 −1 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/04_all_non-zero_exit_status_on_failure.patch
  37. +4 −4 ...lang/python/files/{3.4-20121021 → 3.4-20121216}/05_all_regenerate_platform-specific_modules.patch
  38. +2 −2 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/21_all_distutils_c++.patch
  39. +6 −6 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. +8 −8 dev-lang/python/files/{3.4-20121021 → 3.4-20121216}/61_all_process_data.patch
  42. +1 −1 dev-lang/python/{python-2.7.4_pre20121118.ebuild → python-2.7.4_pre20121216.ebuild}
  43. +1 −1 dev-lang/python/{python-3.2.4_pre20121118.ebuild → python-3.2.4_pre20121216.ebuild}
  44. +1 −1 dev-lang/python/{python-3.3.1_pre20121118.ebuild → python-3.3.1_pre20121216.ebuild}
  45. +2 −2 dev-lang/python/{python-3.4_pre20121118.ebuild → python-3.4_pre20121216.ebuild}
  46. +1 −1 dev-lang/v8/Manifest
  47. +1 −1 dev-lang/v8/{v8-3.15.1.2-r1.ebuild → v8-3.15.11.1.ebuild}
  48. +0 −1 dev-libs/atk/Manifest
  49. +4 −10 dev-libs/atk/atk-1.32.0-r1.ebuild
  50. +0 −44 dev-libs/atk/atk-2.2.0.ebuild
  51. +4 −10 dev-libs/atk/atk-2.4.0.ebuild
  52. +4 −10 dev-libs/atk/atk-2.6.0.ebuild
  53. +0 −4 dev-libs/atk/metadata.xml
  54. +1 −0 dev-libs/opencryptoki/Manifest
  55. +26 −0 dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
  56. +100 −0 dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
  57. +54 −0 dev-perl/PortageXS/PortageXS-0.02.10-r2.ebuild
  58. +77 −0 dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
  59. +137 −0 dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
  60. +1 −0 dev-util/heroku/Manifest
  61. +38 −0 dev-util/heroku/heroku-9999.ebuild
  62. +8 −0 dev-util/heroku/metadata.xml
  63. +27 −0 dev-util/heroku/metadata.xml~
  64. +1 −0 dev-vcs/git-bz/Manifest
  65. +25 −0 dev-vcs/git-bz/git-bz-0.12.12.15.ebuild
  66. +5 −10 dev-vcs/git-bz/git-bz-9999.ebuild
  67. +12 −10 eclass/python-utils-r1.eclass
  68. +1 −0 games-engines/odamex/Manifest
  69. +204 −0 games-engines/odamex/files/odamex-0.6.2-build.patch
  70. +96 −0 games-engines/odamex/odamex-0.6.2.ebuild
  71. +2 −2 games-fps/postal2mp-demo/Manifest
  72. +3 −1 games-fps/postal2mp-demo/postal2mp-demo-1407-r1.ebuild
  73. +1 −1 games-misc/gnurobots/Manifest
  74. +3 −3 games-misc/gnurobots/gnurobots-1.2.0.ebuild
  75. +17 −0 games-mud/minetest-mod/metadata.xml
  76. +0 −1 games-mud/minetest/Manifest
  77. +18 −0 games-mud/minetest/metadata.xml
  78. +1 −1 games-mud/minetest/{minetest-0.4.3.ebuild → minetest-0.4.3-r1.ebuild}
  79. +1 −0 games-mud/minetest/{minetest-9999.ebuild → minetest-9999-r1.ebuild}
  80. +0 −2 gnome-extra/nautilus-sendto/metadata.xml
  81. +4 −4 gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
  82. +4 −4 gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
  83. +4 −4 gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
  84. +0 −1 gnome-extra/nautilus-tracker-tags/Manifest
  85. +0 −43 gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-0.14.2.ebuild
  86. +2 −2 media-fonts/source-pro/Manifest
  87. +3 −3 media-fonts/source-pro/{source-pro-20121014.ebuild → source-pro-20121216.ebuild}
  88. +300 −0 media-gfx/blender/blender-2.63a-r3.ebuild
  89. +2 −2 media-libs/harfbuzz/harfbuzz-0.9.5.ebuild
  90. +15 −0 media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch
  91. +4 −2 media-libs/openimageio/openimageio-1.1.1.ebuild
  92. +1 −1 media-plugins/grilo-plugins/Manifest
  93. +4 −4 media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
  94. +4 −4 media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
  95. +4 −4 media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild
  96. +8 −7 media-plugins/grilo-plugins/{grilo-plugins-0.2.3.ebuild → grilo-plugins-0.2.5.ebuild}
  97. +0 −2 media-plugins/grilo-plugins/metadata.xml
  98. +0 −1 media-sound/rhythmbox/Manifest
  99. +0 −8 media-sound/rhythmbox/metadata.xml
  100. +6 −7 media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
  101. +5 −5 media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
  102. +0 −173 media-sound/rhythmbox/rhythmbox-2.96.ebuild
  103. +5 −5 media-sound/rhythmbox/rhythmbox-2.97.ebuild
  104. +5 −5 media-sound/rhythmbox/rhythmbox-2.98.ebuild
  105. +1 −1 metadata/dtd/timestamp.chk
  106. +1 −1 metadata/glsa/timestamp.chk
  107. +1 −1 metadata/md5-cache/app-admin/eclean-kernel-0.3.1
  108. +1 −1 metadata/md5-cache/app-admin/eclean-kernel-0.3.2
  109. +1 −1 metadata/md5-cache/app-admin/eclean-kernel-9999
  110. +3 −3 metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
  111. +11 −0 metadata/md5-cache/app-arch/cpio-2.11-r1
  112. +1 −1 metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2
  113. +1 −1 metadata/md5-cache/app-emulation/vmware-player-5.0.1.894247
  114. +1 −1 metadata/md5-cache/app-emulation/vmware-workstation-9.0.1.894247
  115. +2 −2 metadata/md5-cache/app-i18n/man-pages-ja-20070515
  116. +2 −2 metadata/md5-cache/app-i18n/man-pages-ja-20101110
  117. +2 −2 metadata/md5-cache/app-i18n/man-pages-ja-20101110-r1
  118. +2 −2 metadata/md5-cache/app-i18n/man-pages-ja-20111020
  119. +4 −4 metadata/md5-cache/app-misc/tracker-0.12.10-r1
  120. +0 −16 metadata/md5-cache/app-misc/tracker-0.14.2-r1
  121. +4 −4 metadata/md5-cache/app-misc/tracker-0.14.3
  122. +4 −4 metadata/md5-cache/app-misc/tracker-0.14.4
  123. +4 −4 metadata/md5-cache/app-misc/tracker-9999
  124. +10 −0 metadata/md5-cache/app-portage/demerge-0.047-r1
  125. +1 −1 metadata/md5-cache/app-portage/diffmask-0.3.3-r2
  126. +1 −1 metadata/md5-cache/app-portage/diffmask-9999
  127. +1 −1 metadata/md5-cache/app-portage/flaggie-0.2-r2
  128. +1 −1 metadata/md5-cache/app-portage/flaggie-0.2-r3
  129. +1 −1 metadata/md5-cache/app-portage/flaggie-9999
  130. +1 −1 metadata/md5-cache/app-portage/gentoopm-0.2.6
  131. +1 −1 metadata/md5-cache/app-portage/gentoopm-0.2.7
  132. +1 −1 metadata/md5-cache/app-portage/gentoopm-9999
  133. +1 −1 metadata/md5-cache/app-portage/install-mask-0.0.2-r2
  134. +1 −1 metadata/md5-cache/app-portage/install-mask-9999
  135. +0 −12 metadata/md5-cache/app-portage/mirrorselect-2.1.0-r1
  136. +0 −12 metadata/md5-cache/app-portage/mirrorselect-2.1.0-r2
  137. +12 −0 metadata/md5-cache/app-portage/mirrorselect-2.2.0-r1
  138. +1 −1 metadata/md5-cache/app-portage/mirrorselect-9999
  139. +1 −1 metadata/md5-cache/app-portage/smart-live-rebuild-1.2.5
  140. +1 −1 metadata/md5-cache/app-portage/smart-live-rebuild-1.3
  141. +1 −1 metadata/md5-cache/app-portage/smart-live-rebuild-9999
  142. +1 −1 metadata/md5-cache/dev-embedded/bitbake-1.17.0
  143. +1 −1 metadata/md5-cache/dev-embedded/bitbake-9999
  144. +1 −1 metadata/md5-cache/dev-java/jython-2.5.3-r2
  145. +1 −1 metadata/md5-cache/dev-lang/{python-2.7.4_pre20121118 → python-2.7.4_pre20121216}
  146. +1 −1 metadata/md5-cache/dev-lang/{python-3.2.4_pre20121118 → python-3.2.4_pre20121216}
  147. +1 −1 metadata/md5-cache/dev-lang/{python-3.3.1_pre20121118 → python-3.3.1_pre20121216}
  148. +1 −1 metadata/md5-cache/dev-lang/{python-3.4_pre20121118 → python-3.4_pre20121216}
  149. +1 −1 metadata/md5-cache/dev-lang/v8-3.14.5.1-r1
  150. +1 −1 metadata/md5-cache/dev-lang/v8-3.14.5.2
  151. +4 −4 metadata/md5-cache/dev-lang/{v8-3.15.1.2-r1 → v8-3.15.11.1}
  152. +1 −1 metadata/md5-cache/dev-lang/v8-3.15.7.2
  153. +1 −1 metadata/md5-cache/dev-lang/v8-9999
  154. +4 −4 metadata/md5-cache/dev-libs/atk-1.32.0-r1
  155. +0 −13 metadata/md5-cache/dev-libs/atk-2.2.0
  156. +4 −4 metadata/md5-cache/dev-libs/atk-2.4.0
  157. +4 −4 metadata/md5-cache/dev-libs/atk-2.6.0
  158. +14 −0 metadata/md5-cache/dev-libs/opencryptoki-2.4.2
  159. +12 −0 metadata/md5-cache/dev-perl/PortageXS-0.02.10-r2
  160. +1 −1 metadata/md5-cache/dev-python/3to2-1.0
  161. +1 −1 metadata/md5-cache/dev-python/cov-core-1.7
  162. +1 −1 metadata/md5-cache/dev-python/jsonschema-0.7
  163. +1 −1 metadata/md5-cache/dev-python/miniupnpc-1.7-r1
  164. +1 −1 metadata/md5-cache/dev-python/pyGPG-9999
  165. +1 −1 metadata/md5-cache/dev-python/pyatspi-2.6.0-r1
  166. +1 −1 metadata/md5-cache/dev-python/pyh2o-9999
  167. +1 −1 metadata/md5-cache/dev-python/pymountboot-0.2.1
  168. +1 −1 metadata/md5-cache/dev-python/pymountboot-0.2.2
  169. +1 −1 metadata/md5-cache/dev-python/pymountboot-9999
  170. +1 −1 metadata/md5-cache/dev-python/pypy-1.8-r2
  171. +1 −1 metadata/md5-cache/dev-python/pypy-1.9-r2
  172. +1 −1 metadata/md5-cache/dev-python/pysctp-0.6
  173. +1 −1 metadata/md5-cache/dev-python/pytest-cov-1.6
  174. +1 −1 metadata/md5-cache/dev-python/python-exec-0.1
  175. +1 −1 metadata/md5-cache/dev-python/python-exec-0.1.1
  176. +1 −1 metadata/md5-cache/dev-python/python-exec-0.2
  177. +1 −1 metadata/md5-cache/dev-python/python-exec-9999
  178. +1 −1 metadata/md5-cache/dev-util/d-feet-0.1.15
  179. +1 −1 metadata/md5-cache/dev-util/d-feet-0.3.1
  180. +1 −1 metadata/md5-cache/dev-util/gdbus-codegen-2.34.2
  181. +1 −1 metadata/md5-cache/dev-util/gdbus-codegen-2.34.3
  182. +8 −0 metadata/md5-cache/dev-util/heroku-9999
  183. +1 −1 metadata/md5-cache/dev-util/synopsis-0.13
  184. +13 −0 metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
  185. +7 −5 metadata/md5-cache/dev-vcs/git-bz-9999
  186. +13 −0 metadata/md5-cache/games-engines/odamex-0.6.2
  187. +1 −1 metadata/md5-cache/games-fps/postal2mp-demo-1407-r1
  188. +2 −2 metadata/md5-cache/games-misc/gnurobots-1.2.0
  189. +3 −3 metadata/md5-cache/games-mud/{minetest-0.4.3 → minetest-0.4.3-r1}
  190. +3 −3 metadata/md5-cache/games-mud/{minetest-9999 → minetest-9999-r1}
  191. +1 −1 metadata/md5-cache/games-util/pyfa-1.1.11
  192. +1 −1 metadata/md5-cache/games-util/pyfa-1.1.12
  193. +1 −1 metadata/md5-cache/gnome-extra/libgsf-1.14.25
  194. +4 −4 metadata/md5-cache/gnome-extra/nautilus-sendto-2.32.0
  195. +4 −4 metadata/md5-cache/gnome-extra/nautilus-sendto-3.0.2
  196. +4 −4 metadata/md5-cache/gnome-extra/nautilus-sendto-3.0.3
  197. +0 −12 metadata/md5-cache/gnome-extra/nautilus-tracker-tags-0.14.2
  198. +2 −2 metadata/md5-cache/media-fonts/{source-pro-20121014 → source-pro-20121216}
  199. +14 −0 metadata/md5-cache/media-gfx/blender-2.63a-r3
  200. +2 −2 metadata/md5-cache/media-libs/harfbuzz-0.9.5
  201. +1 −1 metadata/md5-cache/media-libs/openimageio-1.1.1
  202. +4 −4 metadata/md5-cache/media-plugins/grilo-plugins-0.1.18
  203. +4 −4 metadata/md5-cache/media-plugins/grilo-plugins-0.1.20
  204. +4 −4 metadata/md5-cache/media-plugins/grilo-plugins-0.2.4
  205. +5 −5 metadata/md5-cache/media-plugins/{grilo-plugins-0.2.3 → grilo-plugins-0.2.5}
  206. +1 −1 metadata/md5-cache/media-plugins/quodlibet-plugins-2.4.91
  207. +1 −1 metadata/md5-cache/media-sound/quodlibet-2.4.91
  208. +4 −4 metadata/md5-cache/media-sound/rhythmbox-0.12.8-r1
  209. +4 −4 metadata/md5-cache/media-sound/rhythmbox-0.13.3
  210. +0 −14 metadata/md5-cache/media-sound/rhythmbox-2.96
  211. +3 −3 metadata/md5-cache/media-sound/rhythmbox-2.97
  212. +3 −3 metadata/md5-cache/media-sound/rhythmbox-2.98
  213. +11 −0 metadata/md5-cache/net-analyzer/ettercap-9999
  214. +1 −1 metadata/md5-cache/net-firewall/firewalld-0.2.9-r1
  215. +1 −1 metadata/md5-cache/net-im/ekg2-0.3.1-r1
  216. +1 −1 metadata/md5-cache/net-im/ekg2-9999
  217. +2 −2 metadata/md5-cache/net-libs/libsrtp-1.4.4_p20121108
  218. +1 −1 metadata/md5-cache/net-misc/flexget-1.0_beta3181
  219. +1 −1 metadata/md5-cache/net-misc/flexget-9999
  220. +2 −2 metadata/md5-cache/net-misc/quagga-0.99.21
  221. +1 −1 metadata/md5-cache/net-proxy/hatop-0.7.7
  222. +1 −1 metadata/md5-cache/net-wireless/{aircrack-ng-1.1-r1 → aircrack-ng-1.1-r2}
  223. +1 −1 metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
  224. +2 −2 metadata/md5-cache/sys-apps/{iproute2-3.5.1 → iproute2-3.5.1-r1}
  225. +2 −2 metadata/md5-cache/sys-apps/{iproute2-3.6.0 → iproute2-3.6.0-r1}
  226. +2 −2 metadata/md5-cache/sys-apps/{iproute2-3.7.0 → iproute2-3.7.0-r1}
  227. +11 −0 metadata/md5-cache/sys-apps/rng-tools-4-r2
  228. +1 −1 metadata/md5-cache/sys-apps/systemd-196
  229. +1 −1 metadata/md5-cache/sys-apps/systemd-9999
  230. +0 −8 metadata/md5-cache/sys-firmware/iwl5000-ucode-5.4.0.11
  231. +0 −8 metadata/md5-cache/sys-firmware/iwl5000-ucode-8.83.5.1
  232. +10 −0 metadata/md5-cache/sys-firmware/iwl5000-ucode-8.83.5.1-r1
  233. +1 −1 metadata/md5-cache/sys-fs/loop-aes-3.6g
  234. +0 −13 metadata/md5-cache/www-client/chromium-25.0.1349.2
  235. +13 −0 metadata/md5-cache/www-client/chromium-25.0.1359.3
  236. +3 −3 metadata/md5-cache/www-client/chromium-9999-r1
  237. +4 −4 metadata/md5-cache/x11-libs/gdk-pixbuf-2.26.5
  238. +3 −3 metadata/md5-cache/x11-misc/alacarte-0.13.2
  239. +3 −3 metadata/md5-cache/x11-misc/alacarte-0.13.2-r50
  240. +1 −1 metadata/news/timestamp.chk
  241. +1 −1 metadata/timestamp
  242. +1 −1 metadata/timestamp.chk
  243. +1 −1 metadata/timestamp.x
  244. +59 −0 net-analyzer/ettercap/ettercap-9999.ebuild
  245. +2 −2 net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild
  246. +2 −2 net-misc/quagga/quagga-0.99.21.ebuild
  247. +2 −1 net-wireless/aircrack-ng/{aircrack-ng-1.1-r1.ebuild → aircrack-ng-1.1-r2.ebuild}
  248. +20 −0 net-wireless/aircrack-ng/files/aircrack-ng-1.1-CVE-2010-1159.patch
  249. +5 −1 profiles/base/package.use.mask
  250. +4 −4 profiles/package.mask/funtoo-python
  251. +0 −10 profiles/use.local.desc
  252. +4 −4 sys-apps/iproute2/{iproute2-3.5.1.ebuild → iproute2-3.5.1-r1.ebuild}
  253. +4 −5 sys-apps/iproute2/{iproute2-3.6.0.ebuild → iproute2-3.6.0-r1.ebuild}
  254. +4 −3 sys-apps/iproute2/{iproute2-3.7.0.ebuild → iproute2-3.7.0-r1.ebuild}
  255. +3 −0 sys-apps/iproute2/metadata.xml
  256. +1 −1 sys-apps/rng-tools/Manifest
  257. +27 −0 sys-apps/rng-tools/files/rngd-confd-4.1
  258. +32 −0 sys-apps/rng-tools/files/rngd-initd-4.1
  259. +31 −0 sys-apps/rng-tools/rng-tools-4-r2.ebuild
  260. +2 −3 sys-firmware/iwl5000-ucode/Manifest
  261. +0 −28 sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild
  262. +15 −9 sys-firmware/iwl5000-ucode/{iwl5000-ucode-8.83.5.1.ebuild → iwl5000-ucode-8.83.5.1-r1.ebuild}
  263. +2 −1 sys-fs/loop-aes/loop-aes-3.6g.ebuild
  264. +1 −1 www-client/chromium/Manifest
  265. +50 −44 www-client/chromium/{chromium-25.0.1349.2.ebuild → chromium-25.0.1359.3.ebuild}
  266. +32 −28 www-client/chromium/chromium-9999-r1.ebuild
  267. +20 −0 www-client/chromium/files/chromium-no-pnacl-r0.patch
  268. +6 −6 x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
  269. +0 −4 x11-libs/gdk-pixbuf/metadata.xml
  270. +1 −1 x11-misc/alacarte/Manifest
  271. +3 −3 x11-misc/alacarte/alacarte-0.13.2-r50.ebuild
  272. +3 −3 x11-misc/alacarte/alacarte-0.13.2.ebuild
View
4 app-accessibility/at-spi2-core/metadata.xml
@@ -2,8 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome-accessibility</herd>
- <use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
- </use>
</pkgmetadata>
View
4 app-admin/system-config-printer-common/system-config-printer-common-1.3.12.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-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.2 2012/12/02 22:56:02 ssuominen Exp $
+# $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 $
EAPI=4
@@ -32,7 +32,7 @@ COMMON_DEPEND="
dev-python/pycurl
>=dev-python/pygobject-2.21.5:2
net-print/cups[dbus]
- >=virtual/udev-171
+ >=virtual/udev-172
virtual/libusb:1
"
DEPEND="${COMMON_DEPEND}
View
2 app-arch/cpio/Manifest
@@ -1 +1 @@
-DIST cpio-2.11.tar.bz2 1018483 RMD160 52507b8ba556dca888ce1179cfda10f9549ea9ab SHA1 6f1934b0079dc1e85ddff89cabdf01adb3a74abb SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd
+DIST cpio-2.11.tar.bz2 1018483 SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd SHA512 b6ccb3e121ea29780219d21c9cd6267c2f7b7ae72fb899bb80e1c54cc33e9eac5363443d93dbfbe37e8e8d295dad2724ac607f0543cc62797919605f68c396aa WHIRLPOOL 3e19212f8d5c16de0d531d189fa9fc288ff90d6299c1f3f98f61e182bb0ec278705ae5021c85c7aaeab869ad36b2b3bcd11327a746cde0bf5a596049d711d9cd
View
35 app-arch/cpio/cpio-2.11-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r1.ebuild,v 1.1 2012/12/16 03:24:37 ottxor Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+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"
+IUSE="nls"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-stat.patch #328531
+ epatch "${FILESDIR}"/${P}-no-gets.patch #424974
+ epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ --bindir="${EPREFIX}"/bin \
+ --with-rmt="${EPREFIX}"/usr/sbin/rmt
+}
+
+src_install() {
+ default
+ rm "${ED}"/usr/share/man/man1/mt.1 || die
+ rmdir "${ED}"/usr/libexec || die
+}
View
18 app-arch/cpio/files/cpio-2.11-non-gnu-compilers.patch
@@ -0,0 +1,18 @@
+srcshelton@gmail.com: Patch for IRIX
+
+http://bugs.gentoo.org/show_bug.cgi?id=275295
+
+Sent upstream:
+https://savannah.gnu.org/patch/?7838
+
+--- src/cpiohdr.h.dist 2009-06-24 15:41:26.983725240 +0100
++++ src/cpiohdr.h 2009-06-24 15:41:59.753567720 +0100
+@@ -24,6 +24,8 @@
+
+ #ifdef HAVE_ATTRIB_PACKED
+ #define ATTRIB_PACKED __attribute__((packed))
++#else
++#define ATTRIB_PACKED
+ #endif
+
+ #ifdef HAVE_PRAGMA_PACK
View
4 app-emulation/e-uae/e-uae-0.8.29_rc4-r2.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-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild,v 1.1 2012/12/11 18:07:17 grobian Exp $
+# $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 $
EAPI="3"
@@ -55,7 +55,7 @@ src_prepare() {
src_configure() {
strip-flags
-
+
local myconf
# Sound setup.
View
4 app-emulation/vmware-player/vmware-player-5.0.1.894247.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-emulation/vmware-player/vmware-player-5.0.1.894247.ebuild,v 1.1 2012/12/09 14:29:56 vadimk Exp $
+# $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 $
EAPI="4"
@@ -127,7 +127,7 @@ src_install() {
insinto "${VM_INSTALL_DIR}"/lib/vmware
doins -r lib/*
- # Bug 432918
+ # Bug 432918
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
View
4 app-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.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-emulation/vmware-workstation/vmware-workstation-9.0.1.894247.ebuild,v 1.1 2012/12/09 14:30:38 vadimk Exp $
+# $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 $
EAPI="4"
@@ -155,7 +155,7 @@ src_install() {
insinto "${VM_INSTALL_DIR}"/lib/vmware
doins -r lib/*
- # Bug 432918
+ # Bug 432918
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
View
4 app-i18n/man-pages-ja/man-pages-ja-20070515.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-i18n/man-pages-ja/man-pages-ja-20070515.ebuild,v 1.5 2012/12/15 14:47:40 ulm Exp $
+# $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 $
GENTOO_MAN_P="portage-${PN}-20060415"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.linux.or.jp/JM/ http://www.gentoo.gr.jp/jpmain/translation.
SRC_URI="http://www.linux.or.jp/JM/${P}.tar.gz
http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
IUSE=""
View
4 app-i18n/man-pages-ja/man-pages-ja-20101110-r1.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-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
+# $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 $
EAPI="3"
GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
View
4 app-i18n/man-pages-ja/man-pages-ja-20101110.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-i18n/man-pages-ja/man-pages-ja-20101110.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
+# $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 $
EAPI="3"
GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
View
4 app-i18n/man-pages-ja/man-pages-ja-20111020.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-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.2 2012/12/15 14:47:40 ulm Exp $
+# $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 $
EAPI="3"
GENTOO_MAN_P="portage-${PN}-20060415"
@@ -10,7 +10,7 @@ HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translat
SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a Texinfo-manual"
+LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
View
1 app-misc/tracker/Manifest
@@ -1,4 +1,3 @@
DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
-DIST tracker-0.14.2.tar.xz 5985464 SHA256 9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1 SHA512 204749a915e6e9af7057a0de7f8b5c317a56899dd5a9ca05c029ab1a3b47c42e54b3a86eb53c31fa21ad50abebed2b3a4e99008aac6cc23cb3bc9f7faa6504ff WHIRLPOOL 431a2b06e6906269795fd05e10bac912ffcc8d1ee0e5c394e178c5c12197ed6a05ec6ba939cf21946be0a17b84717405ad8b8be3d052b3f82c4d58999308cb07
DIST tracker-0.14.3.tar.xz 6120108 SHA256 7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4 SHA512 c4c30ffc7879069c5487773e7a905b2b4bff811160318f0c46550ef27fa70b23d481234e62059900f8101e2ce19b3c52ee08f65020d98168c0ec31ca263c8663 WHIRLPOOL e8bf48887c0a6cb43accf399b14d6b6e8221bf261c035572791ef56ff8782d57f675e18b60bc9411f201c0311ab58503f5154fe296235cd262e63b9d338580ad
DIST tracker-0.14.4.tar.xz 5946796 SHA256 b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 SHA512 e9d6d28276dc7f9930f0e8801fa3b3ea2a30ced0979309418ff5a36d7417ab85fb4d2c246032cad88ea63a4716b301db95a0046bd17eb1849e8a9a7edc464103 WHIRLPOOL 82aebbd0596c931867c65612672af52a510da202c881b2e1fdaa9a07136f8bef2840c2d0a6546ba0e6a53c9e61c973925dbc917ba5d8ec3b385f0656a34b926a
View
24 app-misc/tracker/files/tracker-0.8.0-strigi.patch
@@ -1,24 +0,0 @@
-diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c tracker-0.8.0/src/tracker-extract/tracker-extract.c
---- tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c 2010-04-02 11:56:16.643135323 +0200
-+++ tracker-0.8.0/src/tracker-extract/tracker-extract.c 2010-04-02 14:22:51.650857844 +0200
-@@ -150,7 +150,7 @@
- TRUE,
- sizeof (ModuleData));
-
--#ifdef HAVE_LIBSTREAMANALYZER
-+#if 0 /* disabling entirely since force_internal_extractors is not available here */
- if (!force_internal_extractors) {
- g_message ("Adding extractor for libstreamanalyzer");
- g_message (" Generic match for ALL (tried first before our module)");
-diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp
---- tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp 2010-04-02 11:56:16.642114293 +0200
-+++ tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp 2010-04-02 11:57:14.835861696 +0200
-@@ -39,7 +39,7 @@
-
- #include <libtracker-common/tracker-type-utils.h>
- #include <libtracker-common/tracker-os-dependant.h>
--#include <libtracker-common/tracker-sparql-builder.h>
-+#include <libtracker-client/tracker-sparql-builder.h>
- #include <libtracker-common/tracker-ontologies.h>
-
- #include <libtracker-extract/tracker-utils.h>
View
26 app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
@@ -1,26 +0,0 @@
-From 8db05ac879dcd7f0e10fb76563ba62512b932bb9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 20 Oct 2010 14:32:19 +0200
-Subject: [PATCH] gentoo: fix build with eds-2.32, cherry-picked from master
-
----
- src/plugins/evolution/tracker-evolution-plugin.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
-index 8e56d8d..991e525 100644
---- a/src/plugins/evolution/tracker-evolution-plugin.c
-+++ b/src/plugins/evolution/tracker-evolution-plugin.c
-@@ -41,7 +41,9 @@
- #include <sqlite3.h>
-
- #include <camel/camel.h>
-+#ifndef HAVE_EDS_2_31_2
- #include <camel/camel-db.h>
-+#endif
-
- #include <mail/mail-config.h>
- #include <mail/mail-session.h>
---
-1.7.3.1
-
View
28 app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
@@ -1,28 +0,0 @@
---- tracker-0.8.17/configure.ac~ 2010-09-02 16:26:20.000000000 +0200
-+++ tracker-0.8.17/configure.ac 2010-12-29 11:51:10.848878668 +0100
-@@ -1150,6 +1150,11 @@
- [enable_poppler_glib=auto])
-
- if test "x$enable_poppler_glib" != "xno" ; then
-+ PKG_CHECK_EXISTS([poppler-glib >= 0.16], [have_poppler_0_16_0=yes])
-+ if test "x$have_poppler_0_16_0" = "xyes"; then
-+ AC_DEFINE([HAVE_POPPLER_0_16_0], [1], [Define to 1 if you have Poppler version 0.16.0 or higher.])
-+ fi
-+
- PKG_CHECK_MODULES(POPPLER_GLIB,
- [poppler-glib >= $POPPLER_GLIB_REQUIRED],
- [have_poppler_glib=yes],
---- tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c~ 2010-09-02 14:51:00.000000000 +0200
-+++ tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c 2010-12-29 11:55:36.165545335 +0100
-@@ -243,7 +243,11 @@
- rect.x1 = rect.y1 = 0;
- poppler_page_get_size (page, &rect.x2, &rect.y2);
-
-+#if defined (HAVE_POPPLER_0_16_0)
-+ text = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-+#else
- text = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+#endif
- t = tracker_text_normalize (text, n_words - words, &normalized_words);
-
- words += normalized_words;
View
61 app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
@@ -1,61 +0,0 @@
-From c1d19b6060bcf5c70ea1bf6eed9bb07583506f6d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 22 Dec 2010 12:46:40 +0100
-Subject: [PATCH 3/3] gentoo: tests apps are not named lt-*
-
----
- tests/libtracker-common/tracker-dbus-test.c | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c
-index c029eb4..245e2d7 100644
---- a/tests/libtracker-common/tracker-dbus-test.c
-+++ b/tests/libtracker-common/tracker-dbus-test.c
-@@ -327,7 +327,7 @@ test_dbus_request_client_lookup ()
- }
- g_test_trap_assert_passed ();
- g_test_trap_assert_stdout ("*TestNewOK*");
-- g_test_trap_assert_stdout ("*lt-tracker-dbus*");
-+ g_test_trap_assert_stdout ("*tracker-dbus*");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- tracker_dbus_request_comment (request_id, context,
-@@ -336,7 +336,7 @@ test_dbus_request_client_lookup ()
- }
- g_test_trap_assert_passed ();
- g_test_trap_assert_stderr ("*TestCommentOK*");
-- g_test_trap_assert_stderr ("*lt-tracker-dbus*");
-+ g_test_trap_assert_stderr ("*tracker-dbus*");
-
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
-@@ -346,7 +346,7 @@ test_dbus_request_client_lookup ()
- }
- g_test_trap_assert_passed ();
- g_test_trap_assert_stdout ("*TestInfoOK*");
-- g_test_trap_assert_stdout ("*lt-tracker-dbus*");
-+ g_test_trap_assert_stdout ("*tracker-dbus*");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
- tracker_dbus_request_debug (request_id, context,
-@@ -355,7 +355,7 @@ test_dbus_request_client_lookup ()
- }
- g_test_trap_assert_passed ();
- g_test_trap_assert_stdout ("*TestDebugOK*");
-- g_test_trap_assert_stdout ("*lt-tracker-dbus*");
-+ g_test_trap_assert_stdout ("*tracker-dbus*");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
- tracker_dbus_request_success (request_id, context);
-@@ -363,7 +363,7 @@ test_dbus_request_client_lookup ()
- }
- g_test_trap_assert_passed ();
- g_test_trap_assert_stdout ("*Success*");
-- g_test_trap_assert_stdout ("*lt-tracker-dbus*");
-+ g_test_trap_assert_stdout ("*tracker-dbus*");
-
- /* Force client shutdown */
- tracker_dbus_enable_client_lookup (FALSE);
---
-1.7.3.4
-
View
516 app-misc/tracker/files/tracker-0.8.17-use-upower.patch
@@ -1,516 +0,0 @@
-From 16a8576cb8e06de02f366002464709797aa92050 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Wed, 14 Apr 2010 03:49:31 +0200
-Subject: [PATCH 2/3] gentoo: port from libdevkit-power-gobject to libupower-glib
-
-Squashed from 0.9 series commits:
- * 0476409b069a8a23f6829af1365426c1d8385d91
- * cfa8dcbcbea9b80ca27636532fb38fbf5d08a110
- * 8099bdd7c8409e7819864b4b7e315fd99383041f
----
- configure.ac | 54 +++---
- src/libtracker-common/Makefile.am | 11 +-
- src/libtracker-common/tracker-power-devicekit.c | 247 -----------------------
- src/libtracker-common/tracker-power-upower.c | 247 +++++++++++++++++++++++
- src/miners/fs/tracker-miner-files.c | 24 +-
- 5 files changed, 291 insertions(+), 292 deletions(-)
- delete mode 100644 src/libtracker-common/tracker-power-devicekit.c
- create mode 100644 src/libtracker-common/tracker-power-upower.c
-
-diff --git a/configure.ac b/configure.ac
-index 4f1ebc4..7c8b284 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,7 +139,7 @@ GTK_REQUIRED=2.18.0
- LIBXML2_REQUIRED=2.6
- LIBNOTIFY_REQUIRED=0.4.3
- HAL_REQUIRED=0.5
--DEVKIT_POWER_REQUIRED=007
-+UPOWER_REQUIRED=0.9.0
- GDKPIXBUF_REQUIRED=2.12.0
- QUILL_REQUIRED=1.0.0
- UNAC_REQUIRED=1.0.0
-@@ -422,36 +422,36 @@ fi
-
-
- ##################################################################
--# Check for DeviceKit-power
-+# Check for UPower
- ##################################################################
-
--AC_ARG_ENABLE(devkit_power,
-- AS_HELP_STRING([--disable-devkit-power],
-- [disable DeviceKit-power support for AC power detection [[default=auto]]]),,
-- [enable_devkit_power=auto])
--
--if test "x$enable_devkit_power" != "xno"; then
-- PKG_CHECK_MODULES(DEVKIT_POWER,
-- [devkit-power-gobject >= $DEVKIT_POWER_REQUIRED],
-- [have_devkit_power=yes] ,
-- [have_devkit_power=no])
-- AC_SUBST(DEVKIT_POWER_CFLAGS)
-- AC_SUBST(DEVKIT_POWER_LIBS)
--
-- if test "x$have_devkit_power" = "xyes"; then
-- AC_DEFINE(HAVE_DEVKIT_POWER, [], [Define if we have DEVKIT_POWER])
-+AC_ARG_ENABLE(upower,
-+ AS_HELP_STRING([--disable-upower],
-+ [disable UPower support for AC power detection [[default=auto]]]),,
-+ [enable_upower=auto])
-+
-+if test "x$enable_upower" != "xno"; then
-+ PKG_CHECK_MODULES(UPOWER,
-+ [upower-glib >= $UPOWER_REQUIRED],
-+ [have_upower=yes] ,
-+ [have_upower=no])
-+ AC_SUBST(UPOWER_CFLAGS)
-+ AC_SUBST(UPOWER_LIBS)
-+
-+ if test "x$have_upower" = "xyes"; then
-+ AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPOWER])
- fi
- else
-- have_devkit_power="no (disabled)"
-+ have_upower="no (disabled)"
- fi
-
--if test "x$enable_devkit_power" = "xyes"; then
-- if test "x$have_devkit_power" != "xyes"; then
-- AC_MSG_ERROR([Couldn't find devkit_power >= $DEVKIT_POWER_REQUIRED.])
-+if test "x$enable_upower" = "xyes"; then
-+ if test "x$have_upower" != "xyes"; then
-+ AC_MSG_ERROR([Couldn't find upower >= $UPOWER_REQUIRED.])
- fi
- fi
-
--AM_CONDITIONAL(HAVE_DEVKIT_POWER, test "x$have_devkit_power" = "xyes")
-+AM_CONDITIONAL(HAVE_UPOWER, test "x$have_upower" = "xyes")
-
- ##################################################################
- # Check for HAL
-@@ -462,7 +462,7 @@ AC_ARG_ENABLE(hal,
- [disable HAL support for AC power detection [[default=auto]]]),,
- [enable_hal=auto])
-
--if test "x$have_devkit_power" != "xyes" && test "x$enable_hal" != "xno"; then
-+if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
- PKG_CHECK_MODULES(HAL,
- [hal >= $HAL_REQUIRED],
- [have_hal=yes] ,
-@@ -478,8 +478,8 @@ else
- fi
-
- if test "x$enable_hal" = "xyes"; then
-- if test "x$have_devkit_power" = "xyes"; then
-- AC_MSG_ERROR([Only one of DeviceKit-power and HAL can be used.])
-+ if test "x$have_upower" = "xyes"; then
-+ AC_MSG_ERROR([Only one of UPower and HAL can be used.])
- elif test "x$have_hal" != "xyes"; then
- AC_MSG_ERROR([Couldn't find hal >= $HAL_REQUIRED.])
- fi
-@@ -1797,8 +1797,8 @@ Build Configuration:
- Enable unit tests: $have_unit_tests
-
- Support for ioprio: $tracker_cv_have_ioprio
-- Support for HAL: $have_hal
-- Support for DeviceKit-power: $have_devkit_power
-+ Support for HAL: $have_hal
-+ Support for UPower: $have_upower
- Support for file monitoring: $have_file_monitor
- Support for accent stripping (unac): $have_unac
- Support for Cyrillic languages (enca): $have_enca
-diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
-index 5a3d33e..555fcff 100644
---- a/src/libtracker-common/Makefile.am
-+++ b/src/libtracker-common/Makefile.am
-@@ -4,14 +4,13 @@ INCLUDES = \
- -DSHAREDIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"Tracker\" \
- -DTRACKER_COMPILATION \
-- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
- -I$(top_srcdir)/src \
- $(WARN_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(GCOV_CFLAGS) \
- $(GIO_CFLAGS) \
- $(HAL_CFLAGS) \
-- $(DEVKIT_POWER_CFLAGS) \
-+ $(UPOWER_CFLAGS) \
- $(DBUS_CFLAGS)
-
- libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-@@ -23,12 +22,12 @@ else
- os_sources = tracker-os-dependant-unix.c
- endif
-
--# Prefer DeviceKit-power for the power data if it's available, else fall back to HAL
--if HAVE_DEVKIT_POWER
-+# Prefer UPower for the power data if it's available, else fall back to HAL
-+if HAVE_UPOWER
- power_headers = \
- tracker-power.h
- power_sources = \
-- tracker-power-devicekit.c
-+ tracker-power-upower.c
- else
- if HAVE_HAL
- power_headers = \
-@@ -77,7 +76,7 @@ libtracker_common_la_LDFLAGS = \
- libtracker_common_la_LIBADD = \
- $(top_builddir)/src/libstemmer/libstemmer.la \
- $(HAL_LIBS) \
-- $(DEVKIT_POWER_LIBS) \
-+ $(UPOWER_LIBS) \
- $(DBUS_LIBS) \
- $(GIO_LIBS) \
- $(GCOV_LIBS) \
-diff --git a/src/libtracker-common/tracker-power-devicekit.c b/src/libtracker-common/tracker-power-devicekit.c
-deleted file mode 100644
-index 4022302..0000000
-
-Hunk removed to avoid 20k patch size limit.
-
-diff --git a/src/libtracker-common/tracker-power-upower.c b/src/libtracker-common/tracker-power-upower.c
-new file mode 100644
-index 0000000..8a1b71e
---- /dev/null
-+++ b/src/libtracker-common/tracker-power-upower.c
-@@ -0,0 +1,247 @@
-+/*
-+ * Copyright (C) 2006, Jamie McCracken <jamiemcc@gnome.org>
-+ * Copyright (C) 2008, Nokia <ivan.frade@nokia.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
-+
-+#include "config.h"
-+
-+#ifdef HAVE_UPOWER
-+
-+#include <upower.h>
-+
-+#include "tracker-power.h"
-+
-+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_POWER, TrackerPowerPriv))
-+
-+typedef struct {
-+ UpClient *client;
-+ gboolean on_battery;
-+ gboolean on_low_battery;
-+} TrackerPowerPriv;
-+
-+static void tracker_power_finalize (GObject *object);
-+static void tracker_power_get_property (GObject *object,
-+ guint param_id,
-+ GValue *value,
-+ GParamSpec *pspec);
-+static void tracker_power_client_changed_cb (UpClient *client,
-+ TrackerPower *power);
-+
-+enum {
-+ PROP_0,
-+ PROP_ON_BATTERY,
-+ PROP_ON_LOW_BATTERY,
-+ PROP_BATTERY_PERCENTAGE
-+};
-+
-+G_DEFINE_TYPE (TrackerPower, tracker_power, G_TYPE_OBJECT);
-+
-+static void
-+tracker_power_class_init (TrackerPowerClass *klass)
-+{
-+ GObjectClass *object_class;
-+
-+ object_class = G_OBJECT_CLASS (klass);
-+
-+ object_class->finalize = tracker_power_finalize;
-+ object_class->get_property = tracker_power_get_property;
-+
-+ g_object_class_install_property (object_class,
-+ PROP_ON_BATTERY,
-+ g_param_spec_boolean ("on-battery",
-+ "Battery in use",
-+ "Whether the battery is being used",
-+ FALSE,
-+ G_PARAM_READABLE));
-+
-+ g_object_class_install_property (object_class,
-+ PROP_ON_LOW_BATTERY,
-+ g_param_spec_boolean ("on-low-battery",
-+ "Battery low",
-+ "Whether the battery is low",
-+ FALSE,
-+ G_PARAM_READABLE));
-+ g_object_class_install_property (object_class,
-+ PROP_BATTERY_PERCENTAGE,
-+ g_param_spec_double ("battery-percentage",
-+ "Battery percentage",
-+ "Current battery percentage left",
-+ 0.0,
-+ 1.0,
-+ 0.0,
-+ G_PARAM_READABLE));
-+
-+ g_type_class_add_private (object_class, sizeof (TrackerPowerPriv));
-+}
-+
-+static void
-+tracker_power_init (TrackerPower *power)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ g_message ("Initializing UPower...");
-+
-+ priv = GET_PRIV (power);
-+
-+ /* connect to a UPower instance */
-+ priv->client = up_client_new ();
-+ g_signal_connect (priv->client, "changed",
-+ G_CALLBACK (tracker_power_client_changed_cb), power);
-+
-+ /* coldplug */
-+ priv->on_battery = up_client_get_on_battery (priv->client);
-+ priv->on_low_battery = up_client_get_on_low_battery (priv->client);
-+}
-+
-+static void
-+tracker_power_finalize (GObject *object)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ priv = GET_PRIV (object);
-+
-+ g_object_unref (priv->client);
-+
-+ (G_OBJECT_CLASS (tracker_power_parent_class)->finalize) (object);
-+}
-+
-+static void
-+tracker_power_get_property (GObject *object,
-+ guint param_id,
-+ GValue *value,
-+ GParamSpec *pspec)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ priv = GET_PRIV (object);
-+
-+ switch (param_id) {
-+ case PROP_ON_BATTERY:
-+ g_value_set_boolean (value, priv->on_battery);
-+ break;
-+ case PROP_ON_LOW_BATTERY:
-+ g_value_set_boolean (value, priv->on_low_battery);
-+ break;
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-+ break;
-+ };
-+}
-+
-+/**
-+ * tracker_power_client_changed_cb:
-+ **/
-+static void
-+tracker_power_client_changed_cb (UpClient *client, TrackerPower *power)
-+{
-+ gboolean on_battery;
-+ gboolean on_low_battery;
-+ TrackerPowerPriv *priv;
-+
-+ priv = GET_PRIV (power);
-+
-+ /* get the on-battery state */
-+ on_battery = up_client_get_on_battery (priv->client);
-+ if (on_battery != priv->on_battery) {
-+ priv->on_battery = on_battery;
-+ g_object_notify (G_OBJECT (power), "on-battery");
-+ }
-+
-+ /* get the on-low-battery state */
-+ on_low_battery = up_client_get_on_low_battery (priv->client);
-+ if (on_low_battery != priv->on_low_battery) {
-+ priv->on_low_battery = on_low_battery;
-+ g_object_notify (G_OBJECT (power), "on-low-battery");
-+ }
-+}
-+
-+/**
-+ * tracker_power_new:
-+ *
-+ * Creates a new instance of #TrackerPower.
-+ *
-+ * Returns: The newly created #TrackerPower.
-+ **/
-+TrackerPower *
-+tracker_power_new ()
-+{
-+ return g_object_new (TRACKER_TYPE_POWER, NULL);
-+}
-+
-+/**
-+ * tracker_power_get_on_battery:
-+ * @power: A #TrackerPower.
-+ *
-+ * Returns whether the computer battery (if any) is currently in use.
-+ *
-+ * Returns: #TRUE if the computer is running on battery power.
-+ **/
-+gboolean
-+tracker_power_get_on_battery (TrackerPower *power)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
-+
-+ priv = GET_PRIV (power);
-+
-+ return priv->on_battery;
-+}
-+
-+/**
-+ * tracker_power_get_on_low_battery:
-+ * @power: A #TrackerPower
-+ *
-+ * Returns whether the computer has batteries.
-+ *
-+ * Returns: #TRUE if the computer has batteries available.
-+ **/
-+gboolean
-+tracker_power_get_on_low_battery (TrackerPower *power)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
-+
-+ priv = GET_PRIV (power);
-+
-+ return priv->on_low_battery;
-+}
-+
-+/**
-+ * tracker_power_get_battery_percentage:
-+ * @power: A #TrackerPower
-+ *
-+ * Returns the percentage of battery power available.
-+ *
-+ * Returns: #gdouble representing the percentage between 0.0 and 1.0.
-+ **/
-+gdouble
-+tracker_power_get_battery_percentage (TrackerPower *power)
-+{
-+ TrackerPowerPriv *priv;
-+
-+ g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
-+
-+ priv = GET_PRIV (power);
-+
-+ /* FIXME: Implement */
-+ return 0.5;
-+}
-+
-+#endif /* HAVE_UPOWER */
-diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
-index 86364ab..6732364 100644
---- a/src/miners/fs/tracker-miner-files.c
-+++ b/src/miners/fs/tracker-miner-files.c
-@@ -76,9 +76,9 @@ struct TrackerMinerFilesPrivate {
-
- guint low_battery_pause_cookie;
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
- TrackerPower *power;
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
- gulong finished_handler;
-
- DBusGProxy *extractor_proxy;
-@@ -225,7 +225,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
- G_CALLBACK (mount_point_removed_cb),
- mf);
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
- priv->power = tracker_power_new ();
-
- g_signal_connect (priv->power, "notify::on-low-battery",
-@@ -234,7 +234,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
- g_signal_connect (priv->power, "notify::on-battery",
- G_CALLBACK (battery_status_cb),
- mf);
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
-
- priv->finished_handler = g_signal_connect_after (mf, "finished",
- G_CALLBACK (miner_finished_cb),
-@@ -323,9 +323,9 @@ miner_files_finalize (GObject *object)
- g_slist_free (priv->index_single_directories);
- }
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
- g_object_unref (priv->power);
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
-
- g_object_unref (priv->storage);
-
-@@ -375,9 +375,9 @@ miner_files_constructed (GObject *object)
-
- mounts = tracker_storage_get_device_roots (mf->private->storage, type, TRUE);
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
- check_battery_status (mf);
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
-
- g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
-
-@@ -988,7 +988,7 @@ mount_point_added_cb (TrackerStorage *storage,
- g_free (urn);
- }
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
-
- static void
- set_up_throttle (TrackerMinerFiles *mf,
-@@ -1092,7 +1092,7 @@ index_on_battery_cb (GObject *object,
- check_battery_status (mf);
- }
-
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
-
- /* Called when mining has finished the first time */
- static void
-@@ -1118,9 +1118,9 @@ miner_finished_cb (TrackerMinerFS *fs,
- mf->private->finished_handler = 0;
- }
-
--#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
-+#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
- check_battery_status (mf);
--#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
-+#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
- }
-
- static void
---
-1.7.3.4
-
View
1 app-misc/tracker/metadata.xml
@@ -24,7 +24,6 @@
<flag name="thunderbird">Install email data miner plugin for
<pkg>mail-client/thunderbird</pkg> and
<pkg>mail-client/thunderbird-bin</pkg></flag>
- <flag name="upnp">Add support for video extraction via <pkg>media-libs/gupnp-dlna</pkg>.</flag>
<flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
</use>
</pkgmetadata>
View
11 app-misc/tracker/tracker-0.12.10-r1.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-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.3 2012/10/25 18:40:42 eva Exp $
+# $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 $
EAPI="4"
GCONF_DEBUG="no"
@@ -16,7 +16,8 @@ LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# USE="doc" is managed by eclass.
-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
+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-av +vorbis xine +xml xmp" # qt4 strigi
# Test suite highly disfunctional, loops forever
# putting aside for now
@@ -59,8 +60,8 @@ RDEPEND="
gsf? ( >=gnome-extra/libgsf-1.13 )
gstreamer? (
>=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+ !upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
gtk? (
>=dev-libs/libgee-0.3:0
@@ -127,7 +128,7 @@ pkg_setup() {
if use gstreamer ; then
G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
+ if use upnp-av; then
G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
else
G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
View
286 app-misc/tracker/tracker-0.14.2-r1.ebuild
@@ -1,286 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.4 2012/10/25 18:40:42 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-VALA_MIN_API_VERSION="0.14"
-
-[[ ${PV} = 9999 ]] && inherit autotools git-2
-inherit eutils gnome2 linux-info multilib python vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-EGIT_REPO_URI="git://git.gnome.org/${PN}
- http://git.gnome.org/browse/${PN}"
-[[ ${PV} = 9999 ]] && SRC_URI=""
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
-REQUIRED_USE="cue? ( gstreamer )"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
- >=app-i18n/enca-1.9
- >=dev-db/sqlite-3.7[threadsafe]
- >=dev-libs/glib-2.28:2
- >=dev-libs/gobject-introspection-0.9.5
- >=dev-libs/icu-4
- || (
- >=media-gfx/imagemagick-5.2.1[png,jpeg=]
- media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
- >=media-libs/libpng-1.2
- >=x11-libs/pango-1
- sys-apps/util-linux
-
- applet? (
- >=gnome-base/gnome-panel-2.91.6
- >=x11-libs/gdk-pixbuf-2.12:2
- >=x11-libs/gtk+-3:3 )
- cue? ( media-libs/libcue )
- eds? (
- >=mail-client/evolution-3.3.5
- >=gnome-extra/evolution-data-server-3.3.5
- <mail-client/evolution-3.5.3
- <gnome-extra/evolution-data-server-3.5.3 )
- elibc_glibc? ( >=sys-libs/glibc-2.12 )
- exif? ( >=media-libs/libexif-0.6 )
- firefox-bookmarks? ( || (
- >=www-client/firefox-4.0
- >=www-client/firefox-bin-4.0 ) )
- flac? ( >=media-libs/flac-1.2.1 )
- flickr? ( net-libs/rest:0.7 )
- gif? ( media-libs/giflib )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
- gsf? ( >=gnome-extra/libgsf-1.13 )
- gstreamer? (
- >=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
- !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
- gtk? (
- >=dev-libs/libgee-0.3:0
- >=x11-libs/gtk+-3:3 )
- iptc? ( media-libs/libiptcdata )
- iso? ( >=sys-libs/libosinfo-0.0.2 )
- jpeg? ( virtual/jpeg:0 )
- laptop? ( >=sys-power/upower-0.9 )
- mp3? (
- >=media-libs/taglib-1.6
- gtk? ( x11-libs/gdk-pixbuf:2 ) )
- networkmanager? ( >=net-misc/networkmanager-0.8 )
- pdf? (
- >=x11-libs/cairo-1
- >=app-text/poppler-0.16[cairo,utils]
- >=x11-libs/gtk+-2.12:2 )
- playlist? ( dev-libs/totem-pl-parser )
- rss? ( net-libs/libgrss )
- thunderbird? ( || (
- >=mail-client/thunderbird-5.0
- >=mail-client/thunderbird-bin-5.0 ) )
- tiff? ( media-libs/tiff )
- vorbis? ( >=media-libs/libvorbis-0.22 )
- xine? ( >=media-libs/xine-lib-1 )
- xml? ( >=dev-libs/libxml2-2.6 )
- xmp? ( >=media-libs/exempi-2.1 )"
-# strigi? ( >=app-misc/strigi-0.7 )
-# mp3? ( qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- gtk? ( >=dev-libs/libgee-0.3 )
- doc? (
- app-office/dia
- >=dev-util/gtk-doc-1.8
- media-gfx/graphviz )
- test? (
- >=dev-libs/dbus-glib-0.82-r1
- >=sys-apps/dbus-1.3.1[X] )
-"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
- dev-util/gtk-doc-am
- >=dev-util/gtk-doc-1.8
- $(vala_depend)
-"
-[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
-
-function inotify_enabled() {
- if linux_config_exists; then
- if ! linux_chkconfig_present INOTIFY_USER; then
- ewarn "You should enable the INOTIFY support in your kernel."
- ewarn "Check the 'Inotify support for userland' under the 'File systems'"
- ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
- die 'missing CONFIG_INOTIFY'
- fi
- else
- einfo "Could not check for INOTIFY support in your kernel."
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- inotify_enabled
-
- if use gstreamer ; then
- G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
- G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
- else
- G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
- fi
- elif use xine ; then
- G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
- else
- G2CONF="${G2CONF} --enable-generic-media-extractor=external"
- fi
-
- # if use mp3 && (use gtk || use qt4); then
- if use mp3 && use gtk; then
- #G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
- G2CONF="${G2CONF} --enable-gdkpixbuf"
- fi
-
- # unicode-support: libunistring, libicu or glib ?
- # According to NEWS, introspection is required
- # FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
- # is not being generated
- # XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
- # nautilus extension is in a separate package, nautilus-tracker-tags
- G2CONF="${G2CONF}
- --disable-hal
- --enable-tracker-fts
- --with-enca
- --with-unicode-support=libicu
- --enable-guarantee-metadata
- --enable-introspection
- --disable-libstreamanalyzer
- --disable-qt
- --disable-nautilus-extension
- $(use_enable applet tracker-search-bar)
- $(use_enable cue libcue)
- $(use_enable eds miner-evolution)
- $(use_enable exif libexif)
- $(use_enable firefox-bookmarks miner-firefox)
- $(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
- FIREFOX=${S}/firefox-version.sh
- $(use_enable flac libflac)
- $(use_enable flickr miner-flickr)
- $(use_enable gnome-keyring)
- $(use_enable gsf libgsf)
- $(use_enable gtk tracker-explorer)
- $(use_enable gtk tracker-preferences)
- $(use_enable gtk tracker-needle)
- $(use_enable iptc libiptcdata)
- $(use_enable iso libosinfo)
- $(use_enable jpeg libjpeg)
- $(use_enable laptop upower)
- $(use_enable mp3 taglib)
- $(use_enable networkmanager network-manager)
- $(use_enable pdf poppler)
- $(use_enable playlist)
- $(use_enable rss miner-rss)
- $(use_enable test functional-tests)
- $(use_enable test unit-tests)
- $(use_enable thunderbird miner-thunderbird)
- $(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
- THUNDERBIRD=${S}/thunderbird-version.sh
- $(use_enable tiff libtiff)
- $(use_enable vorbis libvorbis)
- $(use_enable xml libxml2)
- $(use_enable xmp exempi)"
- # $(use_enable strigi libstreamanalyzer)
-
- DOCS="AUTHORS ChangeLog NEWS README"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} = 9999 ]]; then
- git_src_unpack
- else
- gnome2_src_unpack
- fi
-}
-
-src_prepare() {
- # bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
- epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
-
- # Fix functional tests scripts
- find "${S}" -name "*.pyc" -delete
- python_convert_shebangs -r 2 tests utils examples
-
- # Don't run 'firefox --version' or 'thunderbird --version'; it results in
- # access violations on some setups (bug #385347, #385495).
- create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
- create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
- # FIXME: report broken tests
- sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
- -e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
- -i tests/libtracker-miner/tracker-password-provider-test.c || die
-
- if [[ ${PV} = 9999 ]]; then
- eautoreconf
- vala_src_prepare
- fi
- gnome2_src_prepare
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
- gnome2_src_install
-
- # Manually symlink extensions for {firefox,thunderbird}-bin
- if use firefox-bookmarks; then
- dosym /usr/share/xul-ext/trackerfox \
- /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
- fi
-
- if use thunderbird; then
- dosym /usr/share/xul-ext/trackerbird \
- /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
- fi
-}
-
-create_version_script() {
- # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
- local v=$(best_version ${1})
- v=${v#${1}-}
- local vbin=$(best_version ${1}-bin)
- vbin=${vbin#${1}-bin-}
-
- if [[ -z ${v} ]]; then
- v=${vbin}
- else
- version_compare ${v} ${vbin}
- [[ $? -eq 1 ]] && v=${vbin}
- fi
-
- echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
- chmod +x "$3" || die
-}
View
11 app-misc/tracker/tracker-0.14.3.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-misc/tracker/tracker-0.14.3.ebuild,v 1.2 2012/10/25 18:40:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.3.ebuild,v 1.3 2012/12/15 19:01:29 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -25,7 +25,8 @@ else
KEYWORDS="~amd64 ~x86"
fi
# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
+gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
REQUIRED_USE="cue? ( gstreamer )"
@@ -70,8 +71,8 @@ RDEPEND="
gsf? ( >=gnome-extra/libgsf-1.13 )
gstreamer? (
>=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+ !upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
gtk? (
>=dev-libs/libgee-0.3:0
@@ -152,7 +153,7 @@ src_unpack() {
src_prepare() {
if use gstreamer ; then
G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
+ if use upnp-av; then
G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
else
G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
View
12 app-misc/tracker/tracker-0.14.4.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-misc/tracker/tracker-0.14.4.ebuild,v 1.1 2012/11/21 23:04:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.2 2012/12/15 19:01:29 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -26,9 +26,7 @@ else
fi
# USE="doc" is managed by eclass.
IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3
-networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml
-xmp xps" # qt4 strigi
+gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
REQUIRED_USE="cue? ( gstreamer )"
@@ -74,8 +72,8 @@ RDEPEND="
gsf? ( >=gnome-extra/libgsf-1.13 )
gstreamer? (
>=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+ !upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
gtk? (
>=dev-libs/libgee-0.3:0
@@ -158,7 +156,7 @@ src_unpack() {
src_prepare() {
if use gstreamer ; then
G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
+ if use upnp-av; then
G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
else
G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
View
10 app-misc/tracker/tracker-9999.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-misc/tracker/tracker-9999.ebuild,v 1.54 2012/11/07 21:06:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.55 2012/12/15 19:01:29 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -25,7 +25,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
REQUIRED_USE="cue? ( gstreamer )"
@@ -70,8 +70,8 @@ RDEPEND="
gsf? ( >=gnome-extra/libgsf-1.13 )
gstreamer? (
>=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+ !upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
gtk? (
>=dev-libs/libgee-0.3:0
@@ -152,7 +152,7 @@ src_unpack() {
src_prepare() {
if use gstreamer ; then
G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
+ if use upnp-av; then
G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
else
G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
View
44 app-portage/demerge/demerge-0.047-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/demerge/demerge-0.047-r1.ebuild,v 1.2 2012/12/15 20:27:37 armin76 Exp $
+
+DESCRIPTION="demerge - revert to previous installation states"
+HOMEPAGE="http://download.mpsna.de/opensource/demerge/"
+SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ >=dev-perl/PortageXS-0.02.10-r2
+ virtual/perl-Term-ANSIColor
+ dev-perl/TermReadKey
+ dev-perl/Shell-EnvImporter"
+RDEPEND="${DEPEND}
+ sys-apps/portage"
+
+src_unpack() {
+ unpack "${A}"
+ cd "${S}"
+
+ # Fix path for new make.conf location
+ sed -i -e 's:/etc/make.conf:/etc/portage/make.conf:g' demerge
+}
+
+src_install() {
+ dobin demerge || die
+ dodoc Changelog
+ doman demerge.3
+}
+
+pkg_postinst() {
+ if [ ! -e /etc/portage/postsync.d/demerge-record ]; then
+ mkdir -p /etc/portage/postsync.d/
+ echo '[ -x /usr/bin/demerge ] && /usr/bin/demerge --postsync' > /etc/portage/postsync.d/demerge-record
+ elog "/etc/portage/postsync.d/demerge-record has been installed for convenience"
+ elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x /etc/portage/postsync.d/demerge-record"
+ elog "If ever you find this to be an inconvenience simply chmod -x /etc/portage/postsync.d/demerge-record"
+ fi
+}
View
1 app-portage/mirrorselect/Manifest
@@ -1 +1,2 @@
DIST mirrorselect-2.1.0.tar.bz2 9282 SHA256 cbff801e561aa1466feaf27a6182f90012afba9590fb91d87289629d54207816 SHA512 e026604534994fe256e27c221b5ace5de9e4fa36a9e631cd01ba6124870372b31d28352dd28ba5af4164f7c0a86942bd3410523f01555ff79a8a823717e8a6c0 WHIRLPOOL 73cb0813e48f667e939df8eafc329d4e2776359a9d885ee976d9d9f98d8d461d92327726b353ec4e4fe94ae31aea8af00e604b2f917fc0e17b844f3a2d70eff4
+DIST mirrorselect-2.2.0.tar.gz 12977 SHA256 e3e00db9733618c9801b03e9d60c0f7b34dea15b69adff5c8d11782d40528fbe SHA512 d5c90d10fe81e2f4ada4b0db04c75d9211c0654807a07423753d451127835ab55929288d9ee61e41090824961f86ef8b82db629c3803f896c3a519eeb2e3bd2e WHIRLPOOL 3c48917494c07ef9c6fcfabb18ebb1598fb6fbd2a11625a5773e7cfc6ed43a7cf24f39d14a05f236ec282e4a2ff85d361826ad8c0130a232d23cbceb79fd1a76
View
27 app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
@@ -0,0 +1,27 @@
+From bc0efc857b5708ea572e3a4c57c9689cf48c50ad Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sat, 15 Dec 2012 20:48:17 -0800
+Subject: [PATCH] Fix setup.py to use PVR instead of VERSION from the
+ environment so that egg-info is set correctly during the
+ merge.
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8a9f980..7a53076 100755
+--- a/setup.py
++++ b/setup.py
+@@ -12,7 +12,7 @@ import os
+ import io
+
+
+-__version__ = os.getenv('VERSION', default='9999')
++__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
+
+ cwd = os.getcwd()
+
+--
+1.8.0
+
View
92 app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
@@ -0,0 +1,92 @@
+From 362ba4585a48273289f382c16947e858ff3818cf Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sat, 15 Dec 2012 18:37:50 -0800
+Subject: [PATCH] Add aditional debug info, fix bug 373195, removing garbage
+ or otherwise inaccessible file system mirrors from existing
+ SYNC or GENTOO_MIRRORS make.conf values.
+
+---
+ mirrorselect/main.py | 14 +++++++++++---
+ mirrorselect/selectors.py | 4 +++-
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/mirrorselect/main.py b/mirrorselect/main.py
+index cbff890..48d74a7 100755
+--- a/mirrorselect/main.py
++++ b/mirrorselect/main.py
+@@ -154,8 +154,7 @@ class MirrorSelect(object):
+ sys.exit(0)
+
+
+- @staticmethod
+- def get_filesystem_mirrors(config_path, sync=False):
++ def get_filesystem_mirrors(self, config_path, sync=False):
+ """Read the current mirrors and retain mounted filesystems mirrors
+
+ @param config_path: string
+@@ -170,6 +169,7 @@ class MirrorSelect(object):
+ else:
+ var = 'GENTOO_MIRRORS'
+
++ self.output.write('get_filesystem_mirrors(): config_path = %s\n' % config_path)
+ try:
+ f = open(config_path,'r')
+ except IOError:
+@@ -182,6 +182,8 @@ class MirrorSelect(object):
+ lex.quotes = "\"'"
+ while 1:
+ key = lex.get_token()
++ #self.output.write('get_filesystem_mirrors(): processing key = %s\n' % key, 2)
++
+ if key == var:
+ equ = lex.get_token()
+
+@@ -196,16 +198,22 @@ class MirrorSelect(object):
+
+ """ Look for mounted filesystem in value """
+ mirrorlist = val.rsplit()
++ self.output.write('get_filesystem_mirrors(): mirrorlist = %s\n' % mirrorlist, 2)
+ p = re.compile('rsync://|http://|ftp://', re.IGNORECASE)
+ for mirror in mirrorlist:
+ if (p.match(mirror) == None):
+- fsmirrors.append(mirror)
++ if os.access(mirror, os.F_OK):
++ self.output.write('get_filesystem_mirrors(): found file system mirror = %s\n' % mirror, 2)
++ fsmirrors.append(mirror)
++ else:
++ self.output.write('get_filesystem_mirrors(): ignoring non-accessible mirror = %s\n' % mirror, 2)
+ break
+ elif key is None:
+ break
+ except Exception:
+ fsmirrors = []
+
++ self.output.write('get_filesystem_mirrors(): fsmirrors = %s\n' % fsmirrors, 2)
+ return fsmirrors
+
+
+diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
+index b2a5fc7..38ca07a 100644
+--- a/mirrorselect/selectors.py
++++ b/mirrorselect/selectors.py
+@@ -303,14 +303,16 @@ class Deep(object):
+
+ self.output.write('\n') #this just makes output nicer
+
+- #can't just return the dict.valuse, because we want the fastest mirror first...
++ #can't just return the dict.values, because we want the fastest mirror first...
+ keys = list(top_hosts.keys())
+ keys.sort()
+
+ rethosts = []
+ for key in keys:
++ #self.output.write('deeptest(): adding rethost %s, %s' % (key, top_hosts[key]), 2)
+ rethosts.append(top_hosts[key])
+
++ self.output.write('deeptest(): final rethost %s' % (rethosts), 2)
+ self.urls = rethosts
+
+
+--
+1.8.0
+
View
50 app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild,v 1.10 2012/05/21 04:49:48 darkside Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND=2
-PYTHON_USE_WITH="xml"
-
-inherit eutils python
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
- dev-util/dialog
- net-analyzer/netselect"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-src_prepare() {
- # bug 312753
- epatch "${FILESDIR}/0001-Fix-rsync-mirror-selection.patch"
-}
-
-src_install() {
- newsbin main.py ${PN} || die
-
- installation() {
- insinto $(python_get_sitedir)
- doins -r ${PN}/
- }
- python_execute_function installation
-
- doman ${PN}.8 || die
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
View
52 app-portage/mirrorselect/mirrorselect-2.1.0-r2.ebuild
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.1.0-r2.ebuild,v 1.10 2012/05/21 04:49:48 darkside Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND=2
-PYTHON_USE_WITH="xml"
-
-inherit eutils python
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
- dev-util/dialog
- net-analyzer/netselect"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-src_prepare() {
- # bug 312753
- epatch "${FILESDIR}/0001-Fix-rsync-mirror-selection.patch"
- # bug 330611
- epatch "${FILESDIR}/0002-Check-for-a-valid-mirrorselect-test-file.patch"
-}
-
-src_install() {
- newsbin main.py ${PN} || die
-
- installation() {
- insinto $(python_get_sitedir)
- doins -r ${PN}/
- }
- python_execute_function installation
-
- doman ${PN}.8 || die
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
View
56 app-portage/mirrorselect/mirrorselect-2.2.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.0-r1.ebuild,v 1.1 2012/12/16 06:12:56 dolsen Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.1"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit eutils distutils python prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="http://dev.gentoo.org/~dolsen/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+
+# Note: dev-lang/python dependencies are so emerge will print a blocker if any
+# installed slot of python is not built with +xml. This is used since
+# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
+RDEPEND="
+ >=dev-lang/python-2.6[xml]
+ !>=dev-lang/python-2.6[-xml]
+ dev-util/dialog
+ net-analyzer/netselect
+ "
+# virtual/python-argparse"
+
+src_prepare() {
+ epatch "${FILESDIR}/2.2.0-Ignore-inaccessible-fsmirrors.patch"
+ epatch "${FILESDIR}/2.2.0-Fix-setup.py-PVR.patch"
+ eprefixify setup.py mirrorselect/main.py
+}
+
+distutils_src_compile_pre_hook() {
+ echo Now setting version... VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+ VERSION="${PVR}" "$(PYTHON)" setup.py set_version || die "setup.py set_version failed"
+}
+
+src_compile() {
+ distutils_src_compile
+}
+
+src_install() {
+ python_convert_shebangs -r "" build-*/scripts-*
+ distutils_src_install
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+}
View
4 app-portage/mirrorselect/mirrorselect-9999.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-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.2 2012/11/15 04:49:30 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.3 2012/12/16 06:12:56 dolsen Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -41,7 +41,7 @@ src_prepare() {
}
distutils_src_compile_pre_hook() {
- echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
+ echo Now setting version... VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
}
View
4 ...1021/01_all_static_library_location.patch → ...1216/01_all_static_library_location.patch
@@ -4,7 +4,7 @@ http://bugs.python.org/issue6103