Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

glorious funtoo updates

merged:

  gentoo: 1bf87cf4d3ab81d95446a5f759dd2ccdb520fc77
  funtoo-overlay: 3e2bffb6385b68041c818cc4c871cd3f40a0eef6
  foo-overlay: 4e928d47e22991dc209ec57d02372c56ceff4275
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: dd3b7c244227d000e55d37845e639e7de0ebd0f5
  lcd-filtering: dd3d9b094dbfc726ee9b3d886783a18b92f899fd
  mythtv: 37abce84cec29314f4b135db8ed42413043d35be
  • Loading branch information...
commit 6a4a721b3c5fea9f1fc5f3a9ef9b444f9674e9c6 1 parent 2e8d811
@danielrobbins danielrobbins authored
Showing with 3,546 additions and 995 deletions.
  1. +4 −3 app-admin/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
  2. +2 −2 app-admin/setools/setools-3.3.7-r3.ebuild
  3. +1 −0  app-backup/deja-dup/Manifest
  4. +59 −0 app-backup/deja-dup/deja-dup-23.4.ebuild
  5. +2 −2 app-editors/emacs/emacs-24.1.ebuild
  6. +2 −2 app-i18n/uim/uim-1.8.0.ebuild
  7. +56 −0 app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
  8. +36 −0 app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
  9. +4 −2 app-misc/mc/{mc-4.8.4-r1.ebuild → mc-4.8.4-r2.ebuild}
  10. +0 −1  app-text/stardict/metadata.xml
  11. +0 −115 app-text/stardict/stardict-3.0.3-r1.ebuild
  12. +1 −0  dev-db/sqliteodbc/Manifest
  13. +42 −0 dev-db/sqliteodbc/sqliteodbc-0.96.ebuild
  14. +157 −0 dev-lang/jython/jython-2.5.3_pre20120729.ebuild
  15. +9 −3 dev-lang/jython/{jython-2.7_pre20120701.ebuild → jython-2.7_pre20120729.ebuild}
  16. +70 −0 dev-lang/python/files/3.2-20120729/01_all_static_library_location.patch
  17. +89 −0 dev-lang/python/files/3.2-20120729/02_all_disable_modules_and_ssl.patch
  18. +21 −0 dev-lang/python/files/3.2-20120729/03_all_add_portage_search_path.patch
  19. +176 −0 dev-lang/python/files/3.2-20120729/04_all_libdir.patch
  20. +10 −0 dev-lang/python/files/3.2-20120729/05_all_verbose_building_of_extensions.patch
  21. +31 −0 dev-lang/python/files/3.2-20120729/06_all_non-zero_exit_status_on_failure.patch
  22. +110 −0 dev-lang/python/files/3.2-20120729/07_all_regenerate_platform-specific_modules.patch
  23. +258 −0 dev-lang/python/files/3.2-20120729/21_all_distutils_c++.patch
  24. +183 −0 dev-lang/python/files/3.2-20120729/22_all_tests_environment.patch
  25. +167 −0 dev-lang/python/files/3.2-20120729/23_all_h2py_encoding.patch
  26. +89 −0 dev-lang/python/files/3.2-20120729/41_all_crosscompile.patch
  27. +166 −0 dev-lang/python/files/3.2-20120729/61_all_process_data.patch
  28. +70 −0 dev-lang/python/files/3.3-20120729/01_all_static_library_location.patch
  29. +57 −0 dev-lang/python/files/3.3-20120729/02_all_disable_modules_and_ssl.patch
  30. +21 −0 dev-lang/python/files/3.3-20120729/03_all_add_portage_search_path.patch
  31. +176 −0 dev-lang/python/files/3.3-20120729/04_all_libdir.patch
  32. +13 −0 dev-lang/python/files/3.3-20120729/05_all_verbose_building_of_extensions.patch
  33. +31 −0 dev-lang/python/files/3.3-20120729/06_all_non-zero_exit_status_on_failure.patch
  34. +110 −0 dev-lang/python/files/3.3-20120729/07_all_regenerate_platform-specific_modules.patch
  35. +262 −0 dev-lang/python/files/3.3-20120729/21_all_distutils_c++.patch
  36. +191 −0 dev-lang/python/files/3.3-20120729/22_all_tests_environment.patch
  37. +167 −0 dev-lang/python/files/3.3-20120729/23_all_h2py_encoding.patch
  38. +166 −0 dev-lang/python/files/3.3-20120729/61_all_process_data.patch
  39. +1 −1  dev-lang/python/{python-2.7.4_pre20120701.ebuild → python-2.7.4_pre20120729.ebuild}
  40. +2 −2 dev-lang/python/{python-3.2.4_pre20120701.ebuild → python-3.2.4_pre20120729.ebuild}
  41. +2 −2 dev-lang/python/{python-3.3_pre20120701.ebuild → python-3.3_pre20120729.ebuild}
  42. +2 −2 dev-libs/iniparser/iniparser-3.1.ebuild
  43. +1 −0  dev-perl/WWW-Dict-Leo-Org/Manifest
  44. +31 −0 dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-1.350.0.ebuild
  45. +8 −8 dev-perl/WWW-Dict-Leo-Org/metadata.xml
  46. +1 −1  dev-python/pyxdg/Manifest
  47. +2 −3 dev-python/pyxdg/{pyxdg-0.21-r1000.ebuild → pyxdg-0.22-r1000.ebuild}
  48. +1 −0  dev-python/repoze-lru/Manifest
  49. +25 −0 dev-python/repoze-lru/repoze-lru-0.6.ebuild
  50. +1 −0  dev-python/speaklater/Manifest
  51. +26 −0 dev-python/speaklater/speaklater-1.3.ebuild
  52. +1 −0  dev-python/testify/Manifest
  53. +41 −0 dev-python/testify/testify-0.2.7.ebuild
  54. +1 −0  dev-python/tox/Manifest
  55. +32 −0 dev-python/tox/tox-1.4.2.ebuild
  56. +1 −0  dev-python/whisper/Manifest
  57. +19 −0 dev-python/whisper/whisper-0.9.10.ebuild
  58. +0 −2  dev-ruby/htmlentities/Manifest
  59. +0 −28 dev-ruby/htmlentities/htmlentities-4.2.4.ebuild
  60. +0 −28 dev-ruby/htmlentities/htmlentities-4.3.0.ebuild
  61. +20 −20 dev-util/eric/Manifest
  62. 0  dev-util/eric/{eric-4.5.4-r1000.ebuild → eric-4.5.5-r1000.ebuild}
  63. 0  dev-util/eric/{eric-5.2.3-r1000.ebuild → eric-5.2.4-r1000.ebuild}
  64. +2 −2 dev-util/suse-build/{suse-build-2011.01.20.ebuild → suse-build-2011.01.20-r1.ebuild}
  65. +2 −2 dev-util/suse-build/{suse-build-2011.09.26.ebuild → suse-build-2011.09.26-r1.ebuild}
  66. +2 −2 dev-util/suse-build/suse-build-9999.ebuild
  67. +5 −2 eclass/multiprocessing.eclass
  68. +1 −1  games-simulation/lincity-ng/Manifest
  69. +19 −0 games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
  70. +5 −1 games-simulation/lincity-ng/lincity-ng-2.0.ebuild
  71. +2 −2 kde-misc/networkmanagement/Manifest
  72. +1 −1  kde-misc/networkmanagement/{networkmanagement-0.9.0.3.ebuild → networkmanagement-0.9.0.4.ebuild}
  73. +2 −2 mail-mta/nullmailer/nullmailer-1.10-r1.ebuild
  74. +2 −2 media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
  75. +2 −2 media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
  76. +1 −1  media-libs/fontconfig-infinality/metadata.xml
  77. +1 −1  media-libs/libxspf/Manifest
  78. +6 −6 media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
  79. +12 −0 media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
  80. +22 −12 media-libs/libxspf/libxspf-1.2.0.ebuild
  81. +1 −2  media-sound/lmms/Manifest
  82. +0 −67 media-sound/lmms/lmms-0.4.12.ebuild
  83. +2 −1  media-sound/lmms/{lmms-0.4.13.ebuild → lmms-0.4.13-r1.ebuild}
  84. +0 −2  media-sound/qmmp/Manifest
  85. +0 −106 media-sound/qmmp/qmmp-0.5.5.ebuild
  86. +0 −106 media-sound/qmmp/qmmp-0.5.6.ebuild
  87. +0 −106 media-sound/qmmp/qmmp-0.6.1.ebuild
  88. +1 −2  media-sound/tomahawk/Manifest
  89. +0 −35 media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
  90. +0 −1  media-sound/tomahawk/metadata.xml
  91. +0 −88 media-sound/tomahawk/tomahawk-0.4.2.ebuild
  92. +2 −2 media-sound/tomahawk/{tomahawk-0.5.4.ebuild → tomahawk-0.5.5.ebuild}
  93. +2 −2 media-sound/tomahawk/tomahawk-9999.ebuild
  94. +1 −1  metadata/dtd/timestamp.chk
  95. +1 −1  metadata/glsa/timestamp.chk
  96. +1 −1  metadata/md5-cache/app-accessibility/brltty-4.2
  97. +1 −1  metadata/md5-cache/app-accessibility/epos-2.5.37-r1
  98. +1 −1  metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
  99. +1 −1  metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2
  100. +1 −1  metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r1
  101. +1 −1  metadata/md5-cache/app-accessibility/sphinx2-0.6
  102. +1 −1  metadata/md5-cache/app-accessibility/sphinx3-0.8
  103. +1 −1  metadata/md5-cache/app-accessibility/sphinxbase-0.7
  104. +1 −1  metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
  105. +1 −1  metadata/md5-cache/app-admin/abrt-2.0.6
  106. +1 −1  metadata/md5-cache/app-admin/abrt-2.0.8
  107. +1 −1  metadata/md5-cache/app-admin/apachetop-0.12.6-r1
  108. +1 −1  metadata/md5-cache/app-admin/ccze-0.2.1-r2
  109. +1 −1  metadata/md5-cache/app-admin/ccze-0.2.1-r3
  110. +1 −1  metadata/md5-cache/app-admin/chrpath-0.13-r2
  111. +1 −1  metadata/md5-cache/app-admin/collectd-5.1.0
  112. +1 −1  metadata/md5-cache/app-admin/collectd-5.1.0-r1
  113. +1 −1  metadata/md5-cache/app-admin/conky-1.8.1-r6
  114. +1 −1  metadata/md5-cache/app-admin/conserver-8.1.18
  115. +1 −1  metadata/md5-cache/app-admin/cronolog-1.6.2-r3
  116. +1 −1  metadata/md5-cache/app-admin/cronolog-1.6.2-r4
  117. +1 −1  metadata/md5-cache/app-admin/elektra-0.7.1
  118. +3 −2 metadata/md5-cache/app-admin/eselect-lcdfilter-1
  119. +1 −1  metadata/md5-cache/app-admin/eselect-python-99999999
  120. +1 −1  metadata/md5-cache/app-admin/evtxtools-1.1.0
  121. +1 −1  metadata/md5-cache/app-admin/evtxtools-1.1.1
  122. +1 −1  metadata/md5-cache/app-admin/fam-2.7.0-r6
  123. +1 −1  metadata/md5-cache/app-admin/gam-server-0.1.10
  124. +1 −1  metadata/md5-cache/app-admin/gam-server-0.1.10-r1
  125. +1 −1  metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115
  126. +1 −1  metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1
  127. +1 −1  metadata/md5-cache/app-admin/gnome-system-tools-2.32.0-r3
  128. +1 −1  metadata/md5-cache/app-admin/gtkdiskfree-2.0.1
  129. +1 −1  metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r3
  130. +1 −1  metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r4
  131. +1 −1  metadata/md5-cache/app-admin/integrit-4.0
  132. +1 −1  metadata/md5-cache/app-admin/integrit-4.1
  133. +1 −1  metadata/md5-cache/app-admin/logmon-0.4.4
  134. +1 −1  metadata/md5-cache/app-admin/lsyncd-2.0.4-r1
  135. +1 −1  metadata/md5-cache/app-admin/osiris-4.2.3
  136. +1 −1  metadata/md5-cache/app-admin/paco-2.0.9-r1
  137. +1 −1  metadata/md5-cache/app-admin/prelude-manager-0.9.15
  138. +1 −1  metadata/md5-cache/app-admin/procinfo-ng-2.0.304
  139. +1 −1  metadata/md5-cache/app-admin/psmon-1.39
  140. +1 −1  metadata/md5-cache/app-admin/rackview-0.09-r2
  141. +1 −1  metadata/md5-cache/app-admin/rsyslog-5.8.11
  142. +1 −1  metadata/md5-cache/app-admin/rsyslog-5.8.12
  143. +1 −1  metadata/md5-cache/app-admin/rsyslog-5.8.5
  144. +1 −1  metadata/md5-cache/app-admin/rsyslog-6.2.1
  145. +1 −1  metadata/md5-cache/app-admin/rsyslog-6.2.2
  146. +1 −1  metadata/md5-cache/app-admin/sagan-0.2.0-r1
  147. +1 −1  metadata/md5-cache/app-admin/sagan-0.2.0-r2
  148. +1 −1  metadata/md5-cache/app-admin/sagan-0.2.1
  149. +1 −1  metadata/md5-cache/app-admin/sagan-0.2.1-r1
  150. +1 −1  metadata/md5-cache/app-admin/setools-3.3.7-r1
  151. +3 −3 metadata/md5-cache/app-admin/setools-3.3.7-r3
  152. +1 −1  metadata/md5-cache/app-admin/swatch-3.1
  153. +1 −1  metadata/md5-cache/app-admin/swatch-3.2.3-r1
  154. +1 −1  metadata/md5-cache/app-admin/syslog-ng-3.2.5
  155. +1 −1  metadata/md5-cache/app-admin/syslog-ng-3.3.5
  156. +1 −1  metadata/md5-cache/app-admin/syslog-ng-3.3.5-r1
  157. +1 −1  metadata/md5-cache/app-admin/system-config-printer-common-1.3.6
  158. +1 −1  metadata/md5-cache/app-admin/system-config-printer-common-1.3.7
  159. +1 −1  metadata/md5-cache/app-admin/system-config-printer-common-1.3.9-r2
  160. +1 −1  metadata/md5-cache/app-admin/system-config-printer-common-1.3.9-r3
  161. +1 −1  metadata/md5-cache/app-admin/system-config-printer-common-1.3.9-r4
  162. +1 −1  metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.6
  163. +1 −1  metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.7
  164. +1 −1  metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.9-r1
  165. +1 −1  metadata/md5-cache/app-admin/tripwire-2.3.1.2-r2
  166. +1 −1  metadata/md5-cache/app-admin/tripwire-2.4.2
  167. +1 −1  metadata/md5-cache/app-admin/tripwire-2.4.2-r1
  168. +1 −1  metadata/md5-cache/app-admin/tripwire-2.4.2.2
  169. +1 −1  metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
  170. +1 −1  metadata/md5-cache/app-admin/ulogd-1.24-r2
  171. +1 −1  metadata/md5-cache/app-admin/webalizer-2.01.10-r15
  172. +1 −1  metadata/md5-cache/app-admin/webalizer-2.01.10-r16
  173. +1 −1  metadata/md5-cache/app-admin/webalizer-2.01.10-r17
  174. +1 −1  metadata/md5-cache/app-admin/webalizer-xtended-2.01.10_p21
  175. +1 −1  metadata/md5-cache/app-admin/webalizer-xtended-2.01.10_p21-r1
  176. +1 −1  metadata/md5-cache/app-antivirus/clamav-0.97.3
  177. +1 −1  metadata/md5-cache/app-antivirus/clamav-0.97.4
  178. +1 −1  metadata/md5-cache/app-arch/alien-8.74
  179. +1 −1  metadata/md5-cache/app-arch/alien-8.86
  180. +1 −1  metadata/md5-cache/app-arch/alien-8.87
  181. +1 −1  metadata/md5-cache/app-arch/arj-3.10.22-r3
  182. +1 −1  metadata/md5-cache/app-arch/arj-3.10.22-r4
  183. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.2
  184. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.4.2-r1
  185. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.4.3
  186. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.6
  187. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.7
  188. +1 −1  metadata/md5-cache/app-arch/dpkg-1.16.8
  189. +1 −1  metadata/md5-cache/app-arch/dump-0.4.44-r1
  190. +1 −1  metadata/md5-cache/app-arch/lha-114i-r7
  191. +1 −1  metadata/md5-cache/app-arch/libpar2-0.2-r3
  192. +1 −1  metadata/md5-cache/app-arch/libzpaq-2.02a-r1
  193. +1 −1  metadata/md5-cache/app-arch/libzpaq-3.00
  194. +1 −1  metadata/md5-cache/app-arch/libzpaq-5.01
  195. +1 −1  metadata/md5-cache/app-arch/pax-3.4.12.16
  196. +1 −1  metadata/md5-cache/app-arch/pdv-1.5.1-r2
  197. +1 −1  metadata/md5-cache/app-arch/rpm-4.10.0
  198. +1 −1  metadata/md5-cache/app-arch/rpm-4.9.1.3
  199. +1 −1  metadata/md5-cache/app-arch/rzip-2.1-r1
  200. +1 −1  metadata/md5-cache/app-arch/rzip-2.1-r2
  201. +1 −1  metadata/md5-cache/app-arch/torrentzip-0.2-r1
  202. +1 −1  metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
  203. +1 −1  metadata/md5-cache/app-arch/unshield-0.6_p20120308
  204. +1 −1  metadata/md5-cache/app-arch/xar-1.5.2
  205. +1 −1  metadata/md5-cache/app-arch/xar-1.5.2-r1
  206. +1 −1  metadata/md5-cache/app-arch/xarchiver-0.5.2-r3
  207. +1 −1  metadata/md5-cache/app-arch/xz-utils-9999
  208. +1 −1  metadata/md5-cache/app-arch/zpaq-2.05
  209. +1 −1  metadata/md5-cache/app-arch/zpaq-3.01
  210. +1 −1  metadata/md5-cache/app-arch/zpaq-4.04
  211. +1 −1  metadata/md5-cache/app-backup/amanda-2.6.0_p2-r4
  212. +1 −1  metadata/md5-cache/app-backup/amanda-2.6.1_p2
  213. +1 −1  metadata/md5-cache/app-backup/amanda-3.2.1
  214. +1 −1  metadata/md5-cache/app-backup/amanda-3.2.2
  215. +1 −1  metadata/md5-cache/app-backup/amanda-3.3.0
  216. +1 −1  metadata/md5-cache/app-backup/amanda-3.3.1
  217. +1 −1  metadata/md5-cache/app-backup/backupninja-0.9.10
  218. +1 −1  metadata/md5-cache/app-backup/backupninja-0.9.9
  219. +1 −1  metadata/md5-cache/app-backup/boxbackup-0.10
  220. +1 −1  metadata/md5-cache/app-backup/deja-dup-23.2
  221. +14 −0 metadata/md5-cache/app-backup/deja-dup-23.4
  222. +1 −1  metadata/md5-cache/app-backup/fsarchiver-0.6.12
  223. +1 −1  metadata/md5-cache/app-backup/fsarchiver-0.6.13
  224. +1 −1  metadata/md5-cache/app-backup/fsarchiver-0.6.15
  225. +1 −1  metadata/md5-cache/app-backup/snapback2-0.11
  226. +1 −1  metadata/md5-cache/app-backup/snapback2-0.917
  227. +1 −1  metadata/md5-cache/app-benchmarks/acovea-5.1.1
  228. +1 −1  metadata/md5-cache/app-benchmarks/dbench-4.0
  229. +1 −1  metadata/md5-cache/app-benchmarks/filebench-1.3.4
  230. +1 −1  metadata/md5-cache/app-benchmarks/filebench-1.4.9
  231. +1 −1  metadata/md5-cache/app-benchmarks/httperf-0.8
  232. +1 −1  metadata/md5-cache/app-benchmarks/httperf-0.9.0-r1
  233. +1 −1  metadata/md5-cache/app-benchmarks/os-autoinst-9999
  234. +1 −1  metadata/md5-cache/app-benchmarks/siege-2.66
  235. +1 −1  metadata/md5-cache/app-benchmarks/siege-2.67
  236. +1 −1  metadata/md5-cache/app-benchmarks/siege-2.70
  237. +1 −1  metadata/md5-cache/app-benchmarks/siege-2.72
  238. +1 −1  metadata/md5-cache/app-benchmarks/spew-1.0.8
  239. +1 −1  metadata/md5-cache/app-benchmarks/stress-1.0.0
  240. +1 −1  metadata/md5-cache/app-benchmarks/stress-1.0.1
  241. +1 −1  metadata/md5-cache/app-benchmarks/stress-1.0.3
  242. +1 −1  metadata/md5-cache/app-benchmarks/stress-1.0.4
  243. +1 −1  metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1
  244. +1 −1  metadata/md5-cache/app-cdr/brasero-2.32.1-r1
  245. +1 −1  metadata/md5-cache/app-cdr/brasero-3.2.0-r1
  246. +1 −1  metadata/md5-cache/app-cdr/cdw-0.6.0
  247. +1 −1  metadata/md5-cache/app-cdr/cdw-0.7.0
  248. +1 −1  metadata/md5-cache/app-cdr/cdw-0.7.1
  249. +1 −1  metadata/md5-cache/app-cdr/cdw-9999
  250. +1 −1  metadata/md5-cache/app-cdr/mirage2iso-0.3.1
  251. +1 −1  metadata/md5-cache/app-cdr/xfburn-0.4.3-r3
  252. +1 −1  metadata/md5-cache/app-cdr/xfburn-0.4.3_p20120601
  253. +1 −1  metadata/md5-cache/app-crypt/acr38u-1.7.10-r1
  254. +1 −1  metadata/md5-cache/app-crypt/acr38u-1.7.11
  255. +1 −1  metadata/md5-cache/app-crypt/bsign-0.4.5
  256. +1 −1  metadata/md5-cache/app-crypt/dieharder-2.28.1
  257. +1 −1  metadata/md5-cache/app-crypt/gcr-3.4.1
  258. +1 −1  metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416
  259. +1 −1  metadata/md5-cache/app-crypt/gpa-0.9.1_pre20100416-r1
  260. +1 −1  metadata/md5-cache/app-crypt/gpgme-1.3.0-r1
  261. +1 −1  metadata/md5-cache/app-crypt/gpgme-1.3.1
  262. +1 −1  metadata/md5-cache/app-crypt/gpgme-1.3.2
  263. +1 −1  metadata/md5-cache/app-crypt/heimdal-1.5.1-r1
  264. +1 −1  metadata/md5-cache/app-crypt/heimdal-1.5.2
  265. +1 −1  metadata/md5-cache/app-crypt/heimdal-1.5.2-r1
  266. +1 −1  metadata/md5-cache/app-crypt/onak-0.3.7
  267. +1 −1  metadata/md5-cache/app-crypt/onak-0.4.0
  268. +1 −1  metadata/md5-cache/app-crypt/opencdk-0.6.6
  269. +1 −1  metadata/md5-cache/app-crypt/p11-kit-0.12
  270. +1 −1  metadata/md5-cache/app-crypt/p11-kit-0.13
  271. +1 −1  metadata/md5-cache/app-crypt/scute-1.4.0
  272. +1 −1  metadata/md5-cache/app-crypt/shishi-1.0.1
  273. +1 −1  metadata/md5-cache/app-crypt/stan-0.4.1
  274. +1 −1  metadata/md5-cache/app-crypt/tpm-tools-1.3.5
  275. +1 −1  metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
  276. +1 −1  metadata/md5-cache/app-crypt/trousers-0.3.6
  277. +1 −1  metadata/md5-cache/app-dicts/gjiten-2.6-r1
  278. +1 −1  metadata/md5-cache/app-dicts/ipadic-2.7.0-r1
  279. +1 −1  metadata/md5-cache/app-dicts/ipadic-2.7.0-r2
  280. +1 −1  metadata/md5-cache/app-dicts/wordnet-3.0-r2
  281. +1 −1  metadata/md5-cache/app-dicts/wordnet-3.0-r3
  282. +1 −1  metadata/md5-cache/app-doc/NaturalDocs-1.40
  283. +1 −1  metadata/md5-cache/app-doc/NaturalDocs-1.40-r1
  284. +1 −1  metadata/md5-cache/app-doc/NaturalDocs-1.52
  285. +1 −1  metadata/md5-cache/app-editors/XML-XSH-1.8.2
  286. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.0.2
  287. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.1.1
  288. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.1.2
  289. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.1.3
  290. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.1.5
  291. +1 −1  metadata/md5-cache/app-editors/XML-XSH2-2.1.6
  292. +1 −1  metadata/md5-cache/app-editors/adie-1.6.36
  293. +1 −1  metadata/md5-cache/app-editors/adie-1.7.32
  294. +1 −1  metadata/md5-cache/app-editors/adie-1.7.33
  295. +1 −1  metadata/md5-cache/app-editors/amyedit-1.0-r2
  296. +1 −1  metadata/md5-cache/app-editors/cooledit-3.17.17-r1
  297. +1 −1  metadata/md5-cache/app-editors/emacs-21.4-r24
  298. +1 −1  metadata/md5-cache/app-editors/emacs-22.3-r10
  299. +1 −1  metadata/md5-cache/app-editors/emacs-23.4-r1
  300. +1 −1  metadata/md5-cache/app-editors/emacs-23.4-r3
Sorry, we could not display the entire diff because too many files (7,259) changed.
View
7 app-admin/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-lcdfilter/eselect-lcdfilter-1.ebuild,v 1.1 2012/07/29 15:46:07 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-lcdfilter/eselect-lcdfilter-1.ebuild,v 1.2 2012/07/30 07:13:22 yngwin Exp $
EAPI=4
inherit vcs-snapshot
-DESCRIPTION="Eselect module to choose Freetype LCD filtering settings"
+DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
SRC_URI="${HOMEPAGE}/tarball/v1 -> ${P}.tar.gz"
@@ -14,8 +14,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="app-admin/eselect"
DEPEND=""
+RDEPEND="app-admin/eselect"
+PDEPEND="media-libs/freetype[infinality]"
src_install() {
dodoc README.rst infinality-settings.sh
View
4 app-admin/setools/setools-3.3.7-r3.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/setools/setools-3.3.7-r3.ebuild,v 1.3 2012/07/09 20:40:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r3.ebuild,v 1.4 2012/07/30 16:33:57 swift Exp $
EAPI="2"
PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@ SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X debug java python"
DEPEND=">=sys-libs/libsepol-2.1.4
View
1  app-backup/deja-dup/Manifest
@@ -1,2 +1,3 @@
DIST deja-dup-22.1.tar.xz 777248 SHA256 44cb8fcd45799a369c8da2717792a87e3e183eeca1b07fa8f2aac8664f00ca5e SHA512 52d99c3ee66beca49a5c43bd7026b03347f8311e74c32ff2d98a1594dd0cf4b5cea8011a7e6561e54ae04b6e812149dc6c29982a15db3078cdef548b44e9cb31 WHIRLPOOL a57aebb975c9a5cc05e6f1a390cc910e328f01fae9f18d91d76b4d8cb274036d759ecd8aadee2309b23378622f439ef2b5ddc5629e5b42b1174f55d59feff9bf
DIST deja-dup-23.2.tar.xz 823548 SHA256 64831f407bd102c13939d84600ab427c58f4d0ea1d9ecf2098979ad3eb7a6f2c SHA512 658c70a6248f206b99ed04b59075617ccb9691cbab3b118e68648c17d12732e3e88bd3a954c5c0dad9f08746af43f6cd2289875d65223f2dcb681f07289e7b42 WHIRLPOOL 6d72cdab99824952782fa0a9e17dd0367d3d590e99563ed29c9e8195db684fef61b4cc26d4a5e857b16d61b81ae3edcd27ff869f2af98723b30343e09ecf568e
+DIST deja-dup-23.4.tar.xz 852796 SHA256 67392931fb6958cd13897a78d01fe7a31b169663696313142067901e28de041d SHA512 afe76249084a1b7222272b61673340f5d807867121c69af63f238d2de28b655f61efdd6ae50bb320ddbc481604dbc209d7a98c6f4c16f0646b36bdf635024f26 WHIRLPOOL bc8d2786fecb374a7717332b6c5c07da45d2d9ff8419b6228eb7185ccd2efc087a9ba4ef6af9f9343e5908be20451d9123824dca452082efeb6083277297f6dd
View
59 app-backup/deja-dup/deja-dup-23.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-23.4.ebuild,v 1.1 2012/07/30 08:57:23 jlec Exp $
+
+EAPI=4
+
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Simple backup tool using duplicity back-end"
+HOMEPAGE="https://launchpad.net/deja-dup/"
+SRC_URI="http://launchpad.net/${PN}/24/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libpeas
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+
+ app-backup/duplicity
+ dev-libs/dbus-glib
+ gnome-base/gnome-keyring
+
+ nautilus? ( gnome-base/nautilus )"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gvfs[fuse]"
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ dev-lang/vala:0.16
+ dev-perl/Locale-gettext
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+src_prepare() {
+ DOCS="NEWS AUTHORS"
+ G2CONF="${G2CONF}
+ $(use_with nautilus)
+ --without-ccpanel
+ --without-unity
+ --disable-schemas-compile
+ --disable-static"
+ export VALAC=$(type -p valac-0.16)
+
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ domenu data/deja-dup.desktop
+}
View
4 app-editors/emacs/emacs-24.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.8 2012/07/29 04:59:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.9 2012/07/30 06:28:15 jdhore Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"
View
4 app-i18n/uim/uim-1.8.0.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/uim/uim-1.8.0.ebuild,v 1.6 2012/07/30 03:40:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.7 2012/07/30 11:34:48 blueness Exp $
EAPI="4"
inherit autotools eutils multilib elisp-common flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
LICENSE="BSD GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 x86"
IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
RESTRICT="test"
View
56 app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
@@ -0,0 +1,56 @@
+https://www.midnight-commander.org/ticket/2853
+https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df
+
+Index: src/args.c
+===================================================================
+--- src/args.c (revision 23c95d36ac4465627fbc9183e083a8320df77fcf)
++++ src/args.c (revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df)
+@@ -546,5 +546,5 @@
+ else
+ {
+- arg = mcedit_arg_vpath_new (tmp_vpath, 1);
++ arg = mcedit_arg_vpath_new (tmp_vpath, 0);
+ vfs_path_free (fname_vpath);
+ }
+@@ -553,5 +553,5 @@
+ }
+ else
+- arg = mcedit_arg_new (tmp, 1);
++ arg = mcedit_arg_new (tmp, 0);
+
+ flist = g_list_prepend (flist, arg);
+@@ -559,12 +559,9 @@
+
+ if (flist == NULL)
+- flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1));
++ flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
+ else if (first_line_number != -1)
+ {
+ /* overwrite line number for first file */
+ GList *l;
+-
+- if (first_line_number == 0)
+- first_line_number = 1;
+
+ l = g_list_last (flist);
+@@ -820,5 +817,5 @@
+ *
+ * @param file_name file name
+- * @param line_number line number
++ * @param line_number line number. If value is 0, try to restore saved position.
+ * @return mcedit_arg_t object
+ */
+@@ -835,5 +832,5 @@
+ *
+ * @param file_vpath file path object
+- * @param line_number line number
++ * @param line_number line number. If value is 0, try to restore saved position.
+ * @return mcedit_arg_t object
+ */
+@@ -846,6 +843,4 @@
+ arg = g_new (mcedit_arg_t, 1);
+ arg->file_vpath = file_vpath;
+- if (line_number == 0)
+- line_number = 1;
+ arg->line_number = line_number;
+
View
36 app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
@@ -0,0 +1,36 @@
+https://www.midnight-commander.org/ticket/2858
+https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f
+
+Index: src/filemanager/usermenu.c
+===================================================================
+--- src/filemanager/usermenu.c (revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
++++ src/filemanager/usermenu.c (revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
+@@ -749,6 +749,7 @@
+ return g_strdup ("%");
+
+- if (mc_global.mc_run_mode == MC_RUN_FULL)
+- {
++ switch (mc_global.mc_run_mode)
++ {
++ case MC_RUN_FULL:
+ if (g_ascii_islower ((gchar) c))
+ panel = current_panel;
+@@ -760,9 +761,16 @@
+ }
+ fname = g_strdup (panel->dir.list[panel->selected].fname);
+- }
++ break;
++
+ #ifdef USE_INTERNAL_EDIT
+- else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
++ case MC_RUN_EDITOR:
+ fname = edit_get_file_name (edit_widget);
++ break;
+ #endif
++
++ default:
++ /* other modes don't use formats */
++ return g_strdup ("");
++ }
+
+ if (do_quote)
View
6 app-misc/mc/mc-4.8.4-r1.ebuild → app-misc/mc/mc-4.8.4-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-misc/mc/mc-4.8.4-r1.ebuild,v 1.1 2012/07/21 15:59:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r2.ebuild,v 1.1 2012/07/30 13:00:36 polynomial-c Exp $
EAPI=4
@@ -51,7 +51,9 @@ done
src_prepare() {
strip-linguas ${LANGS}
- epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch
+ epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch \
+ "${FILESDIR}"/${P}-Ticket-2853-fileposition-in-mcedit.patch \
+ "${FILESDIR}"/${P}-Ticket-2858-htmlview-segfault.patch
}
S=${WORKDIR}/${MY_P}
View
1  app-text/stardict/metadata.xml
@@ -9,7 +9,6 @@
as Full-text translation, Net Dict.
</longdescription>
<use>
- <flag name='editor'>Build and install the stardict-editor utility</flag>
<flag name='espeak'>Enable text to speech synthesizer using espeak
engine</flag>
<flag name='gucharmap'>Enable gucharmap dictionary plugin</flag>
View
115 app-text/stardict/stardict-3.0.3-r1.ebuild
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r1.ebuild,v 1.6 2012/05/04 03:33:16 jdhore Exp $
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-EAPI=4
-
-GNOME2_LA_PUNT=yes
-GCONF_DEBUG=no
-
-inherit eutils gnome2
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://code.google.com/p/stardict-3/"
-SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
- pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="editor espeak gnome gucharmap qqwry pronounce spell"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
- dev-libs/libsigc++:2
- sys-libs/zlib
- >=x11-libs/gtk+-2.20:2
- editor? (
- dev-libs/libpcre
- dev-libs/libxml2
- virtual/mysql
- )
- gnome? (
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- >=gnome-base/gconf-2
- >=gnome-base/orbit-2
- )
- gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
- spell? ( >=app-text/enchant-1.2 )"
-RDEPEND="${COMMON_DEPEND}
- espeak? ( >=app-accessibility/espeak-1.29 )"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-RESTRICT="test"
-
-pkg_setup() {
- G2CONF="$(use_enable editor tools)
- --disable-scrollkeeper
- $(use_enable spell)
- $(use_enable gucharmap)
- --disable-festival
- $(use_enable espeak)
- $(use_enable qqwry)
- --disable-updateinfo
- $(use_enable gnome gnome-support)
- --disable-gpe-support
- --disable-schemas-install"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-correct-glib-include.patch \
- "${FILESDIR}"/${P}-entry.patch \
- "${FILESDIR}"/${P}-gcc46.patch \
- "${FILESDIR}"/${P}-compositelookup_cpp.patch \
- "${FILESDIR}"/${P}-overflow.patch
-
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
-
- if use qqwry; then
- insinto /usr/share/stardict/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-}
-
-pkg_postinst() {
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install stardict dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog
- elog " emerge -s stardict-"
-
- gnome2_pkg_postinst
-}
View
1  dev-db/sqliteodbc/Manifest
@@ -1,2 +1,3 @@
DIST sqliteodbc-0.87.tar.gz 456973 SHA256 3ffb3495bccb1b6169c3aac5e15016edcb596044b5f52b073c75223ae152372c SHA512 30d2a7322024dbe4bdaaf3a9414ba137677b0d59e6f700b552044f5583e102a80ce9aab5ae20464e7e8d0d776b0c3abdcb39e3c8b7cd00164367d233ca168d54 WHIRLPOOL 507f16a14338edc5edbd7e05f3804b643f22be3a3ec9cb0a3ae0a41b0ccf02e571220a011f2541f4133a932504223a3dd25bf9fbf05b1a8f511e96a987544f61
DIST sqliteodbc-0.94.tar.gz 668053 SHA256 0e621566d5a498c59cecc66b1c5177c85ae876e09c89d464c13b07b173d6c53f SHA512 d9df87d85f54e6c2e69f45bd0b2263263300880d51f42b9ae4f485e2678c8a0a6e109d318e9cfb179f59e6a6a9b9c16a5e9bda2d9213d806d73a83d30efbccaf WHIRLPOOL 34fd7067d2c95545eadf838ea099365ccb6f2dc081303238fd1c1cad2a9cf99ec130abb9e547a300e161c369f94b76fa44639ffb21065b1cb52685968be28b5c
+DIST sqliteodbc-0.96.tar.gz 670070 SHA256 a5b5a1679e9cbd8cd473079d047c5277b8a57d5875fe35f1e1e576816590bf7f SHA512 447798bbc018890a784abc6b75909fbf9ecd285d6ead3ed437727041ba3ff20ef3ceb1dfe4efb713717b7df2431fd52933e6bcafc2405674cf76518dd5b39435 WHIRLPOOL ded290078b20a32e9d859c0b28297947b9c0df62d66fa64c41d789dea2e2166aed43446a864a3a7ece6cfe7cdc6594dc26558dfda6a45c21bdd869f8fcad81b1
View
42 dev-db/sqliteodbc/sqliteodbc-0.96.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.96.ebuild,v 1.1 2012/07/30 07:51:50 patrick Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="ODBC driver to access local SQLite database files."
+HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
+SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.6
+ || (
+ >=dev-db/unixODBC-2.2
+ >=dev-db/libiodbc-3.5
+ )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.93-respect_LDFLAGS.patch"
+}
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ dodir "/usr/$(get_libdir)"
+ einstall
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ dodoc ChangeLog README
+}
View
157 dev-lang/jython/jython-2.5.3_pre20120729.ebuild
@@ -0,0 +1,157 @@
+# Copyright owners: Gentoo Foundation
+# Arfrever Frehtes Taifersar Arahesis
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4-python"
+JAVA_PKG_IUSE="doc examples oracle source"
+
+inherit java-pkg-2 java-ant-2 python
+
+if [[ "${PV}" == *_pre* ]]; then
+ inherit mercurial
+
+ EHG_REPO_URI="http://hg.python.org/jython"
+ EHG_REVISION="18db8d13c227"
+fi
+
+PATCHSET_REVISION="20120610"
+
+DESCRIPTION="Implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI=""
+
+LICENSE="PSF-2"
+SLOT="2.5"
+PYTHON_ABI="${SLOT}-jython"
+KEYWORDS="~amd64 ~x86"
+IUSE="+readline +ssl test +threads +xml"
+
+CDEPEND="dev-java/ant-core:0
+ dev-java/antlr:3
+ dev-java/asm:3
+ dev-java/guava:0
+ dev-java/jffi:1.0
+ dev-java/jline:0
+ dev-java/jnr-constants:0
+ dev-java/jnr-netdb:0
+ dev-java/jnr-posix:1.1
+ dev-java/jsr223:0
+ >=dev-java/libreadline-java-0.8.0
+ dev-java/xerces:2
+ java-virtuals/servlet-api:2.5
+ oracle? ( dev-java/jdbc-oracle-bin:10.2 )"
+RDEPEND=">=virtual/jre-1.5
+ ${CDEPEND}
+ >=dev-java/java-config-2.1.11-r3
+ !dev-java/jython:${SLOT}"
+DEPEND=">=virtual/jdk-1.5
+ ${CDEPEND}
+ dev-java/junit:0
+ test? ( dev-java/ant-junit:0 )"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ python_pkg_setup
+}
+
+java_prepare() {
+ EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
+
+ find extlibs -name "*.jar" -delete
+ find -name "*.py[co]" -delete
+
+ java-pkg_jar-from --into extlibs ant-core ant.jar
+ java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.3.jar
+ java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
+ java-pkg_jar-from --into extlibs asm-3 asm-commons.jar asm-commons-3.1.jar
+ java-pkg_jar-from --into extlibs guava guava.jar guava-r07.jar
+ java-pkg_jar-from --into extlibs jffi-1.0 jffi.jar jffi.jar
+ java-pkg_jar-from --into extlibs jline jline.jar jline-0.9.95-SNAPSHOT.jar
+ java-pkg_jar-from --into extlibs jnr-constants jnr-constants.jar constantine.jar
+ java-pkg_jar-from --into extlibs jnr-netdb jnr-netdb.jar jnr-netdb-0.4.jar
+ java-pkg_jar-from --into extlibs jnr-posix-1.1 jnr-posix.jar
+ java-pkg_jar-from --build-only --into extlibs junit junit.jar junit-3.8.2.jar
+ java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar libreadline-java-0.8.jar
+ java-pkg_jar-from --into extlibs jsr223 script-api.jar livetribe-jsr223-2.0.5.jar
+ java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar servlet-api-2.5.jar
+ java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar xercesImpl-2.9.1.jar
+
+ # Dependencies of dev-java/antlr:3.
+ java-pkg_jar-from --build-only --into extlibs antlr antlr.jar antlr-2.7.7.jar
+ java-pkg_jar-from --build-only --into extlibs stringtemplate stringtemplate.jar stringtemplate-3.2.jar
+
+ # Dependency of dev-java/jnr-posix:1.1.
+ java-pkg_jar-from --build-only --into extlibs jnr-ffi-0.5 jnr-ffi.jar jaffl.jar
+
+ echo "has.repositories.connection=false" > ant.properties
+ echo "templates.lazy=false" >> ant.properties
+
+ if use oracle; then
+ echo "oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" >> ant.properties
+ fi
+}
+
+src_compile() {
+ if [[ -n "${JYTHON_REGENERATE_FILES}" ]]; then
+ EPYTHON="python2" ant template
+ fi
+
+ eant developer-build $(use_doc javadoc)
+}
+
+src_test() {
+ ANT_TASKS="ant-junit" nonfatal eant prepare-test javatest launchertest regrtest-unix
+}
+
+src_install() {
+ dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+ pushd dist > /dev/null
+ java-pkg_newjar "${PN}-dev.jar"
+
+ local java_args="-Dpython.home=${EPREFIX}/usr/share/${PN}-${SLOT}"
+ java_args+=" -Dpython.cachedir=\$([[ -n \"\${JYTHON_SYSTEM_CACHEDIR}\" ]] && echo ${EPREFIX}/var/cache/${PN}/${SLOT}-\${EUID} || echo \${HOME}/.jython${SLOT}-cachedir)"
+ java_args+=" -Dpython.executable=${EPREFIX}/usr/bin/jython${SLOT}"
+ java-pkg_dolauncher jython${SLOT} --main "org.python.util.jython" --pkg_args "${java_args}"
+
+ java-pkg_register-optional-dependency jdbc-mysql
+ java-pkg_register-optional-dependency jdbc-postgresql
+
+ insinto /usr/share/${PN}-${SLOT}
+ doins -r Lib registry
+ python_clean_installation_image -q
+
+ use doc && java-pkg_dojavadoc Doc/javadoc
+ popd > /dev/null
+
+ use examples && java-pkg_doexamples Demo/*
+ use source && java-pkg_dosrc src
+
+ if use readline; then
+ sed \
+ -e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
+ -e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
+ -i "${ED}usr/share/${PN}-${SLOT}/registry" || die "sed failed"
+ fi
+}
+
+pkg_postinst() {
+ # Clean Jython system cache.
+ rm -fr "${EROOT}var/cache/jython/"${SLOT}-*/*
+
+ python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+ elog
+ elog "Readline can be configured in the registry:"
+ elog
+ elog "python.console=org.python.util.ReadlineConsole"
+ elog "python.console.readlinelib=GnuReadline"
+ elog
+ elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
+ elog "User registry: '~/.jython'"
+ elog
+}
+
+pkg_postrm() {
+ python_mod_cleanup $(python_get_libdir)
+}
View
12 ...lang/jython/jython-2.7_pre20120701.ebuild → ...lang/jython/jython-2.7_pre20120729.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == *_pre* ]]; then
inherit mercurial
EHG_REPO_URI="http://hg.python.org/jython"
- EHG_REVISION="e4afcd777d1b"
+ EHG_REVISION="43ea9699b54d"
fi
PATCHSET_REVISION="20120610"
@@ -24,7 +24,7 @@ LICENSE="PSF-2"
SLOT="2.7"
PYTHON_ABI="${SLOT}-jython"
KEYWORDS="~amd64 ~x86"
-IUSE="+readline +ssl +threads +xml"
+IUSE="+readline +ssl test +threads +xml"
CDEPEND="dev-java/ant-core:0
dev-java/antlr:3
@@ -46,7 +46,8 @@ RDEPEND=">=virtual/jre-1.6
!dev-java/jython:${SLOT}"
DEPEND=">=virtual/jdk-1.6
${CDEPEND}
- dev-java/junit:0"
+ dev-java/junit:0
+ test? ( dev-java/ant-junit:0 )"
pkg_setup() {
java-pkg-2_pkg_setup
@@ -84,6 +85,7 @@ java_prepare() {
java-pkg_jar-from --build-only --into extlibs jnr-ffi-0.7 jnr-ffi.jar jnr-ffi-0.7.4-SNAPSHOT.jar
echo "has.repositories.connection=false" > ant.properties
+ echo "templates.lazy=false" >> ant.properties
if use oracle; then
echo "oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" >> ant.properties
@@ -91,6 +93,10 @@ java_prepare() {
}
src_compile() {
+ if [[ -n "${JYTHON_REGENERATE_FILES}" ]]; then
+ EPYTHON="python2" ant template
+ fi
+
eant developer-build $(use_doc javadoc)
}
View
70 dev-lang/python/files/3.2-20120729/01_all_static_library_location.patch
@@ -0,0 +1,70 @@
+Install libpythonX.Y.a in /usr/lib instead of /usr/lib/pythonX.Y/config.
+https://bugs.gentoo.org/show_bug.cgi?id=252372
+http://bugs.python.org/issue6103
+
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -872,6 +872,19 @@
+ fi; \
+ else true; \
+ fi
++ @if test -f $(LIBRARY) && test $(LIBRARY) != $(LDLIBRARY); then \
++ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
++ if test "$(SO)" = .dll; then \
++ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBDIR); \
++ else \
++ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR); \
++ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY); \
++ fi; \
++ else \
++ echo "Skipped install of $(LIBRARY) - use make frameworkinstall"; \
++ fi; \
++ else true; \
++ fi
+
+ bininstall: altbininstall
+ -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
+@@ -1066,18 +1079,6 @@
+ else true; \
+ fi; \
+ done
+- @if test -d $(LIBRARY); then :; else \
+- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+- if test "$(SO)" = .dll; then \
+- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+- else \
+- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+- fi; \
+- else \
+- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+- fi; \
+- fi
+ $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
+ $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
+--- Misc/python-config.in
++++ Misc/python-config.in
+@@ -47,11 +47,7 @@
+ elif opt in ('--libs', '--ldflags'):
+ libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+ libs.append('-lpython' + pyver + sys.abiflags)
+- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+- # shared library in prefix/lib/.
+ if opt == '--ldflags':
+- if not getvar('Py_ENABLE_SHARED'):
+- libs.insert(0, '-L' + getvar('LIBPL'))
+ if not getvar('PYTHONFRAMEWORK'):
+ libs.extend(getvar('LINKFORSHARED').split())
+ print(' '.join(libs))
+--- Modules/makesetup
++++ Modules/makesetup
+@@ -89,7 +89,7 @@
+ then
+ ExtraLibDir=.
+ else
+- ExtraLibDir='$(LIBPL)'
++ ExtraLibDir='$(LIBDIR)'
+ fi
+ ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
+ esac
View
89 dev-lang/python/files/3.2-20120729/02_all_disable_modules_and_ssl.patch
@@ -0,0 +1,89 @@
+--- setup.py
++++ setup.py
+@@ -21,7 +21,17 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++pdm_env = "PYTHON_DISABLE_MODULES"
++if pdm_env in os.environ:
++ disabled_module_list = os.environ[pdm_env].split()
++else:
++ disabled_module_list = []
++
++pds_env = "PYTHON_DISABLE_SSL"
++if pds_env in os.environ:
++ disable_ssl = os.environ[pds_env]
++else:
++ disable_ssl = 0
+
+ # File which contains the directory for shared mods (for sys.path fixup
+ # when running from the build dir, see Modules/getpath.c)
+@@ -393,6 +403,7 @@
+ os.unlink(tmpfile)
+
+ def detect_modules(self):
++ global disable_ssl
+ # Ensure that /usr/local is always used, but the local build
+ # directories (i.e. '.' and 'Include') must be first. See issue
+ # 10520.
+@@ -682,7 +693,7 @@
+ ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+ search_for_ssl_incs_in
+ )
+- if ssl_incs is not None:
++ if ssl_incs is not None and not disable_ssl:
+ krb5_h = find_file('krb5.h', inc_dirs,
+ ['/usr/kerberos/include'])
+ if krb5_h:
+@@ -693,7 +704,8 @@
+ ] )
+
+ if (ssl_incs is not None and
+- ssl_libs is not None):
++ ssl_libs is not None and
++ not disable_ssl):
+ exts.append( Extension('_ssl', ['_ssl.c'],
+ include_dirs = ssl_incs,
+ library_dirs = ssl_libs,
+@@ -726,7 +738,7 @@
+
+ #print('openssl_ver = 0x%08x' % openssl_ver)
+ min_openssl_ver = 0x00907000
+- have_any_openssl = ssl_incs is not None and ssl_libs is not None
++ have_any_openssl = ssl_incs is not None and ssl_libs is not None and not disable_ssl
+ have_usable_openssl = (have_any_openssl and
+ openssl_ver >= min_openssl_ver)
+
+@@ -744,20 +756,17 @@
+ openssl_ver)
+ missing.append('_hashlib')
+
+- min_sha2_openssl_ver = 0x00908000
+- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
+- # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
+- exts.append( Extension('_sha256', ['sha256module.c'],
+- depends=['hashlib.h']) )
+- exts.append( Extension('_sha512', ['sha512module.c'],
+- depends=['hashlib.h']) )
+-
+- if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
+- # no openssl at all, use our own md5 and sha1
+- exts.append( Extension('_md5', ['md5module.c'],
+- depends=['hashlib.h']) )
+- exts.append( Extension('_sha1', ['sha1module.c'],
+- depends=['hashlib.h']) )
++ ### Build these unconditionally so emerge won't fail
++ ### when openssl is dropped/broken etc.
++ exts.append( Extension('_sha256', ['sha256module.c'],
++ depends=['hashlib.h']) )
++ exts.append( Extension('_sha512', ['sha512module.c'],
++ depends=['hashlib.h']) )
++
++ exts.append( Extension('_md5', ['md5module.c'],
++ depends=['hashlib.h']) )
++ exts.append( Extension('_sha1', ['sha1module.c'],
++ depends=['hashlib.h']) )
+
+ # Modules that provide persistent dictionary-like semantics. You will
+ # probably want to arrange for at least one of them to be available on
View
21 dev-lang/python/files/3.2-20120729/03_all_add_portage_search_path.patch
@@ -0,0 +1,21 @@
+--- Lib/site.py
++++ Lib/site.py
+@@ -289,6 +289,7 @@
+ "python" + sys.version[:3],
+ "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, "lib", "portage", "pym"))
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+--- Lib/test/test_site.py
++++ Lib/test/test_site.py
+@@ -236,7 +236,7 @@
+ self.assertEqual(dirs[2], wanted)
+ elif os.sep == '/':
+ # OS X non-framwework builds, Linux, FreeBSD, etc
+- self.assertEqual(len(dirs), 2)
++ self.assertEqual(len(dirs), 3)
+ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+ 'site-packages')
+ self.assertEqual(dirs[0], wanted)
View
176 dev-lang/python/files/3.2-20120729/04_all_libdir.patch
@@ -0,0 +1,176 @@
+--- Lib/distutils/command/install.py
++++ Lib/distutils/command/install.py
+@@ -44,8 +44,8 @@
+
+ INSTALL_SCHEMES = {
+ 'unix_prefix': {
+- 'purelib': '$base/lib/python$py_version_short/site-packages',
+- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
++ 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages',
++ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages',
+ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+--- Lib/distutils/sysconfig.py
++++ Lib/distutils/sysconfig.py
+@@ -123,7 +123,7 @@
+
+ if os.name == "posix":
+ libpython = os.path.join(prefix,
+- "lib", "python" + get_python_version())
++ "@@GENTOO_LIBDIR@@", "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+--- Lib/site.py
++++ Lib/site.py
+@@ -285,11 +285,11 @@
+ if sys.platform in ('os2emx', 'riscos'):
+ sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+ elif os.sep == '/':
+- sitepackages.append(os.path.join(prefix, "lib",
++ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@",
+ "python" + sys.version[:3],
+ "site-packages"))
+- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+- sitepackages.append(os.path.join(prefix, "lib", "portage", "pym"))
++ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python"))
++ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@", "portage", "pym"))
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+--- Lib/sysconfig.py
++++ Lib/sysconfig.py
+@@ -21,10 +21,10 @@
+
+ _INSTALL_SCHEMES = {
+ 'posix_prefix': {
+- 'stdlib': '{base}/lib/python{py_version_short}',
+- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++ 'stdlib': '{base}/@@GENTOO_LIBDIR@@/python{py_version_short}',
++ 'platstdlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
++ 'purelib': '{base}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
++ 'platlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
+ 'include':
+ '{base}/include/python{py_version_short}{abiflags}',
+ 'platinclude':
+@@ -81,10 +81,10 @@
+ 'data' : '{userbase}',
+ },
+ 'posix_user': {
+- 'stdlib': '{userbase}/lib/python{py_version_short}',
+- 'platstdlib': '{userbase}/lib/python{py_version_short}',
+- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
++ 'stdlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
++ 'platstdlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
++ 'purelib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
++ 'platlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
+ 'include': '{userbase}/include/python{py_version_short}',
+ 'scripts': '{userbase}/bin',
+ 'data' : '{userbase}',
+--- Lib/test/test_site.py
++++ Lib/test/test_site.py
+@@ -237,10 +237,10 @@
+ elif os.sep == '/':
+ # OS X non-framwework builds, Linux, FreeBSD, etc
+ self.assertEqual(len(dirs), 3)
+- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
++ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'python' + sys.version[:3],
+ 'site-packages')
+ self.assertEqual(dirs[0], wanted)
+- wanted = os.path.join('xoxo', 'lib', 'site-python')
++ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'site-python')
+ self.assertEqual(dirs[1], wanted)
+ else:
+ # other platforms
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -106,7 +106,7 @@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/lib
++SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@
+ ABIFLAGS= @ABIFLAGS@
+
+ # Detailed destination directories
+--- Modules/getpath.c
++++ Modules/getpath.c
+@@ -122,8 +122,8 @@
+ #endif
+
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION ":" \
++ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload"
+ #endif
+
+ #ifndef LANDMARK
+@@ -135,7 +135,7 @@
+ static wchar_t progpath[MAXPATHLEN+1];
+ static wchar_t *module_search_path = NULL;
+ static int module_search_path_malloced = 0;
+-static wchar_t *lib_python = L"lib/python" VERSION;
++static wchar_t *lib_python = L"@@GENTOO_LIBDIR@@/python" VERSION;
+
+ static void
+ reduce(wchar_t *dir)
+@@ -583,7 +583,7 @@
+ }
+ else
+ wcsncpy(zip_path, _prefix, MAXPATHLEN);
+- joinpath(zip_path, L"lib/python00.zip");
++ joinpath(zip_path, L"@@GENTOO_LIBDIR@@/python00.zip");
+ bufsz = wcslen(zip_path); /* Replace "00" with version */
+ zip_path[bufsz - 6] = VERSION[0];
+ zip_path[bufsz - 5] = VERSION[2];
+@@ -593,7 +593,7 @@
+ fprintf(stderr,
+ "Could not find platform dependent libraries <exec_prefix>\n");
+ wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
+- joinpath(exec_prefix, L"lib/lib-dynload");
++ joinpath(exec_prefix, L"@@GENTOO_LIBDIR@@/lib-dynload");
+ }
+ /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
+
+--- Modules/Setup.dist
++++ Modules/Setup.dist
+@@ -352,7 +352,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
+
+ # Interface to the Expat XML parser
+ #
+--- setup.py
++++ setup.py
+@@ -460,8 +460,7 @@
+ # if a file is found in one of those directories, it can
+ # be assumed that no additional -I,-L directives are needed.
+ lib_dirs = self.compiler.library_dirs + [
+- '/lib64', '/usr/lib64',
+- '/lib', '/usr/lib',
++ '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@',
+ ]
+ inc_dirs = self.compiler.include_dirs + ['/usr/include']
+ exts = []
+@@ -658,11 +657,11 @@
+ elif curses_library:
+ readline_libs.append(curses_library)
+ elif self.compiler.find_library_file(lib_dirs +
+- ['/usr/lib/termcap'],
++ ['/usr/@@GENTOO_LIBDIR@@/termcap'],
+ 'termcap'):
+ readline_libs.append('termcap')
+ exts.append( Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
++ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'],
+ extra_link_args=readline_extra_link_args,
+ libraries=readline_libs) )
+ else:
View
10 dev-lang/python/files/3.2-20120729/05_all_verbose_building_of_extensions.patch
@@ -0,0 +1,10 @@
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -437,7 +437,6 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ @case $$MAKEFLAGS in \
+- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
View
31 dev-lang/python/files/3.2-20120729/06_all_non-zero_exit_status_on_failure.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/show_bug.cgi?id=281968
+http://bugs.python.org/issue6731
+
+--- setup.py
++++ setup.py
+@@ -37,6 +37,8 @@
+ # when running from the build dir, see Modules/getpath.c)
+ _BUILDDIR_COOKIE = "pybuilddir.txt"
+
++exit_status = 0
++
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (after any relative
+ directories) if:
+@@ -288,6 +290,8 @@
+ print()
+
+ if self.failed:
++ global exit_status
++ exit_status = 1
+ failed = self.failed[:]
+ print()
+ print("Failed to build these modules:")
+@@ -1910,6 +1914,7 @@
+ scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
+ "Tools/scripts/2to3"]
+ )
++ sys.exit(exit_status)
+
+ # --install-platlib
+ if __name__ == '__main__':
View
110 dev-lang/python/files/3.2-20120729/07_all_regenerate_platform-specific_modules.patch
@@ -0,0 +1,110 @@
+http://bugs.python.org/issue12619
+
+--- Lib/plat-aix4/regen
++++ Lib/plat-aix4/regen
+@@ -5,4 +5,4 @@
+ exit 1;;
+ esac
+ set -v
+-h2py.py -i '(u_long)' /usr/include/netinet/in.h
++python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+--- Lib/plat-linux2/regen
++++ Lib/plat-linux2/regen
+@@ -5,4 +5,4 @@
+ exit 1;;
+ esac
+ set -v
+-h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
++python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h /usr/include/linux/cdrom.h
+--- Lib/plat-sunos5/regen
++++ Lib/plat-sunos5/regen
+@@ -5,5 +5,4 @@
+ exit 1;;
+ esac
+ set -v
+-h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/sys/stropts.h /usr/include/dlfcn.h
+-
++python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/sys/stropts.h /usr/include/dlfcn.h
+--- Lib/plat-unixware7/regen
++++ Lib/plat-unixware7/regen
+@@ -5,5 +5,5 @@
+ exit 1;;
+ esac
+ set -v
+-h2py -i '(u_long)' /usr/include/netinet/in.h
+-h2py /usr/include/sys/stropts.h
++python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
++python$EXE ../../Tools/scripts/h2py.py /usr/include/sys/stropts.h
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -397,7 +397,7 @@
+
+ # Default target
+ all: build_all
+-build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Modules/_testembed
++build_all: $(BUILDPYTHON) oldsharedmods sharedmods platformspecificmods gdbhooks Modules/_testembed
+
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -440,6 +440,26 @@
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
++# Build the platform-specific modules
++platformspecificmods: $(BUILDPYTHON) sharedmods
++ @PLATDIR=$(PLATDIR); \
++ if test ! -f $(srcdir)/Lib/$(PLATDIR)/regen; then \
++ $(INSTALL) -d $(srcdir)/Lib/$(PLATDIR); \
++ if test -f $(srcdir)/Lib/$${PLATDIR%?}/regen; then \
++ cp $(srcdir)/Lib/$${PLATDIR%?}/regen $(srcdir)/Lib/$(PLATDIR)/regen; \
++ else \
++ cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen; \
++ fi \
++ fi
++ @EXE="$(BUILDEXE)"; export EXE; \
++ PATH="`pwd`:$$PATH"; export PATH; \
++ PYTHONPATH="`pwd`/Lib"; export PYTHONPATH; \
++ cd $(srcdir)/Lib/$(PLATDIR); \
++ $(RUNSHARED) ./regen || exit 1; \
++ for module in *.py; do \
++ $(RUNSHARED) $(BUILDPYTHON) -c "import py_compile; py_compile.compile('$$module', cfile='/dev/null', doraise=True)" || exit 1; \
++ done
++
+ # Build static library
+ # avoid long command lines, same as LIBRARY_OBJS
+ $(LIBRARY): $(LIBRARY_OBJS)
+@@ -948,7 +968,7 @@
+ multiprocessing multiprocessing/dummy \
+ unittest unittest/test \
+ curses pydoc_data $(MACHDEPS)
+-libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
++libinstall: build_all $(srcdir)/Modules/xxmodule.c
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
+ do \
+ if test ! -d $(DESTDIR)$$i; then \
+@@ -1029,16 +1049,6 @@
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+
+-# Create the PLATDIR source directory, if one wasn't distributed..
+-$(srcdir)/Lib/$(PLATDIR):
+- mkdir $(srcdir)/Lib/$(PLATDIR)
+- cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
+- export PATH; PATH="`pwd`:$$PATH"; \
+- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
+- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
+- export EXE; EXE="$(BUILDEXE)"; \
+- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
+-
+ python-config: $(srcdir)/Misc/python-config.in
+ # Substitution happens here, as the completely-expanded BINDIR
+ # is not available in configure
+@@ -1335,7 +1345,7 @@
+ Python/thread.o: @THREADHEADERS@
+
+ # Declare targets that aren't real files
+-.PHONY: all build_all sharedmods oldsharedmods test quicktest memtest
++.PHONY: all build_all sharedmods oldsharedmods platformspecificmods test quicktest memtest
+ .PHONY: install altinstall oldsharedinstall bininstall altbininstall
+ .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
+ .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
View
258 dev-lang/python/files/3.2-20120729/21_all_distutils_c++.patch
@@ -0,0 +1,258 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -136,9 +136,13 @@
+ self.set_executables(compiler='gcc -mcygwin -O -Wall',
+ compiler_so='gcc -mcygwin -mdll -O -Wall',
+ compiler_cxx='g++ -mcygwin -O -Wall',
++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+ linker_exe='gcc -mcygwin',
+ linker_so=('%s -mcygwin %s' %
+- (self.linker_dll, shared_option)))
++ (self.linker_dll, shared_option)),
++ linker_exe_cxx='g++ -mcygwin',
++ linker_so_cxx=('%s -mcygwin %s' %
++ (self.linker_dll, shared_option)))
+
+ # cygwin and mingw32 need different sets of libraries
+ if self.gcc_version == "2.91.57":
+@@ -162,8 +166,12 @@
+ raise CompileError(msg)
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError as msg:
+ raise CompileError(msg)
+
+@@ -294,10 +302,15 @@
+ self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+ compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+ compiler_cxx='g++ -mno-cygwin -O -Wall',
++ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
+ linker_exe='gcc -mno-cygwin',
+ linker_so='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+- entry_point))
++ entry_point),
++ linker_exe_cxx='g++ -mno-cygwin',
++ linker_so_cxx='%s -mno-cygwin %s %s'
++ % (self.linker_dll, shared_option,
++ entry_point))
+ # Maybe we should also append -mthreads, but then the finished
+ # dlls need another dll (mingwm10.dll see Mingw32 docs)
+ # (-mthreads: Support thread-safe exception handling on `Mingw32')
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@
+ # XXX optimization, warnings etc. should be customizable.
+ self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+
+ # want the gcc library statically linked (so that we don't have
+ # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@
+ raise CompileError(msg)
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError as msg:
+ raise CompileError(msg)
+
+--- Lib/distutils/sysconfig.py
++++ Lib/distutils/sysconfig.py
+@@ -155,9 +155,12 @@
+ varies across Unices and is stored in Python's Makefile.
+ """
+ if compiler.compiler_type == "unix":
+- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+- 'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
++ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED',
++ 'LDCXXSHARED', 'SO', 'AR', 'ARFLAGS')
++
++ cflags = ''
++ cxxflags = ''
+
+ newcc = None
+ if 'CC' in os.environ:
+@@ -195,19 +198,27 @@
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
++ if 'LDCXXSHARED' in os.environ:
++ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+- cflags = opt + ' ' + os.environ['CFLAGS']
++ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
++ if 'CXXFLAGS' in os.environ:
++ cxxflags = os.environ['CXXFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+ if 'AR' in os.environ:
+ ar = os.environ['AR']
+ if 'ARFLAGS' in os.environ:
+@@ -216,13 +227,17 @@
+ archiver = ar + ' ' + ar_flags
+
+ cc_cmd = cc + ' ' + cflags
++ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+- compiler_cxx=cxx,
++ compiler_cxx=cxx_cmd,
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
++ linker_so_cxx=ldcxxshared,
++ linker_exe_cxx=cxx,
+ archiver=archiver)
+
+ compiler.shared_lib_extension = so_ext
+@@ -555,7 +570,7 @@
+ for key in ('LDFLAGS', 'BASECFLAGS',
+ # a number of derived variables. These need to be
+ # patched up as well.
+- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ flags = _config_vars[key]
+ flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
+ flags = re.sub('-isysroot [^ \t]*', ' ', flags)
+@@ -574,7 +589,7 @@
+ for key in ('LDFLAGS', 'BASECFLAGS',
+ # a number of derived variables. These need to be
+ # patched up as well.
+- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+ flags = _config_vars[key]
+ flags = re.sub('-arch\s+\w+\s', ' ', flags)
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -111,14 +111,17 @@
+ # are pretty generic; they will probably have to be set by an outsider
+ # (eg. using information discovered by the sysconfig about building
+ # Python extensions).
+- executables = {'preprocessor' : None,
+- 'compiler' : ["cc"],
+- 'compiler_so' : ["cc"],
+- 'compiler_cxx' : ["cc"],
+- 'linker_so' : ["cc", "-shared"],
+- 'linker_exe' : ["cc"],
+- 'archiver' : ["ar", "-cr"],
+- 'ranlib' : None,
++ executables = {'preprocessor' : None,
++ 'compiler' : ["cc"],
++ 'compiler_so' : ["cc"],
++ 'compiler_cxx' : ["c++"],
++ 'compiler_so_cxx' : ["c++"],
++ 'linker_so' : ["cc", "-shared"],
++ 'linker_exe' : ["cc"],
++ 'linker_so_cxx' : ["c++", "-shared"],
++ 'linker_exe_cxx' : ["c++"],
++ 'archiver' : ["ar", "-cr"],
++ 'ranlib' : None,
+ }
+
+ if sys.platform[:6] == "darwin":
+@@ -167,11 +170,18 @@
+
+ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+ compiler_so = self.compiler_so
++ compiler_so_cxx = self.compiler_so_cxx
+ if sys.platform == 'darwin':
+ compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
++ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
++ extra_postargs)
+ try:
+- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError as msg:
+ raise CompileError(msg)
+
+@@ -229,22 +239,16 @@
+ ld_args.extend(extra_postargs)
+ self.mkpath(os.path.dirname(output_filename))
+ try:
+- if target_desc == CCompiler.EXECUTABLE:
+- linker = self.linker_exe[:]
++ if target_lang == "c++":
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe_cxx[:]
++ else:
++ linker = self.linker_so_cxx[:]
+ else:
+- linker = self.linker_so[:]
+- if target_lang == "c++" and self.compiler_cxx:
+- # skip over environment variable settings if /usr/bin/env
+- # is used to set up the linker's environment.
+- # This is needed on OSX. Note: this assumes that the
+- # normal and C++ compiler have the same environment
+- # settings.
+- i = 0
+- if os.path.basename(linker[0]) == "env":
+- i = 1
+- while '=' in linker[i]:
+- i += 1
+- linker[i] = self.compiler_cxx[i]
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe[:]
++ else:
++ linker = self.linker_so[:]
+
+ if sys.platform == 'darwin':
+ linker = _darwin_compiler_fixup(linker, ld_args)
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -437,7 +437,7 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ @case $$MAKEFLAGS in \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
+ # Build the platform-specific modules
View
183 dev-lang/python/files/3.2-20120729/22_all_tests_environment.patch
@@ -0,0 +1,183 @@
+http://bugs.python.org/issue1674555
+
+--- Lib/site.py
++++ Lib/site.py
+@@ -515,8 +515,9 @@
+ known_paths = removeduppaths()
+ if ENABLE_USER_SITE is None:
+ ENABLE_USER_SITE = check_enableusersite()
+- known_paths = addusersitepackages(known_paths)
+- known_paths = addsitepackages(known_paths)
++ if os.environ.get("_PYTHONNOSITEPACKAGES") is None:
++ known_paths = addusersitepackages(known_paths)
++ known_paths = addsitepackages(known_paths)
+ if sys.platform == 'os2emx':
+ setBEGINLIBPATH()
+ setquit()
+--- Lib/test/regrtest.py
++++ Lib/test/regrtest.py
+@@ -174,6 +174,7 @@
+ import unittest
+ import warnings
+ from inspect import isabstract
++from subprocess import Popen, PIPE
+
+ try:
+ import threading
+@@ -510,6 +511,57 @@
+ support.use_resources = use_resources
+ save_modules = sys.modules.keys()
+
++ opt_args = support.args_from_interpreter_flags()
++ base_cmd = [sys.executable] + opt_args + ['-m', 'test.regrtest']
++ debug_output_pat = re.compile(r"\[\d+ refs\]$")
++
++ def get_args_tuple(test, verbose, quiet, huntrleaks, debug, use_resources,
++ output_on_failure, failfast, match_tests):
++ return (
++ (test, verbose, quiet),
++ dict(huntrleaks=huntrleaks, debug=debug,
++ use_resources=use_resources,
++ output_on_failure=output_on_failure, failfast=failfast,
++ match_tests=match_tests)
++ )
++
++ def _runtest(test, verbose, quiet, huntrleaks=False, debug=False,
++ use_resources=None, output_on_failure=False, failfast=False,
++ match_tests=None):
++ if test == "test_site":
++ args_tuple = get_args_tuple(test, verbose, quiet, huntrleaks, debug,
++ use_resources, output_on_failure,
++ failfast, match_tests)
++ env = os.environ.copy()
++ try:
++ del env["_PYTHONNOSITEPACKAGES"]
++ except KeyError:
++ pass
++ popen = Popen(base_cmd + ['--slaveargs', json.dumps(args_tuple)],
++ stdout=PIPE, stderr=PIPE,
++ universal_newlines=True,
++ close_fds=(os.name != 'nt'),
++ env=env)
++ stdout, stderr = popen.communicate()
++ # Strip last refcount output line if it exists, since it
++ # comes from the shutdown of the interpreter in the subcommand.
++ stderr = debug_output_pat.sub("", stderr)
++ stdout, _, result = stdout.strip().rpartition("\n")
++ result = json.loads(result)
++ if stdout:
++ print(stdout)
++ if stderr:
++ print(stderr, file=sys.stderr)
++ if result[0] == INTERRUPTED:
++ assert result[1] == 'KeyboardInterrupt'
++ raise KeyboardInterrupt
++ return result
++ else:
++ return runtest(test, verbose, quiet, huntrleaks=huntrleaks,
++ debug=debug, use_resources=use_resources,
++ output_on_failure=output_on_failure,
++ failfast=failfast, match_tests=match_tests)
++
+ def accumulate_result(test, result):
+ ok, test_time = result
+ test_times.append((test_time, test))
+@@ -547,12 +599,8 @@
+ print("Multiprocess option requires thread support")
+ sys.exit(2)
+ from queue import Queue
+- from subprocess import Popen, PIPE
+- debug_output_pat = re.compile(r"\[\d+ refs\]$")
+ output = Queue()
+ pending = MultiprocessTests(tests)
+- opt_args = support.args_from_interpreter_flags()
+- base_cmd = [sys.executable] + opt_args + ['-m', 'test.regrtest']
+ def work():
+ # A worker thread.
+ try:
+@@ -562,12 +610,9 @@
+ except StopIteration:
+ output.put((None, None, None, None))
+ return
+- args_tuple = (
+- (test, verbose, quiet),
+- dict(huntrleaks=huntrleaks, use_resources=use_resources,
+- debug=debug, output_on_failure=verbose3,
+- failfast=failfast, match_tests=match_tests)
+- )
++ args_tuple = get_args_tuple(test, verbose, quiet, huntrleaks,
++ debug, use_resources, verbose3,
++ failfast, match_tests)
+ # -E is needed by some tests, e.g. test_import
+ # Running the child from the same working directory ensures
+ # that TEMPDIR for the child is the same when
+@@ -632,13 +677,13 @@
+ if trace:
+ # If we're tracing code coverage, then we don't exit with status
+ # if on a false return value from main.
+- tracer.runctx('runtest(test, verbose, quiet)',
++ tracer.runctx('_runtest(test, verbose, quiet)',
+ globals=globals(), locals=vars())
+ else:
+ try:
+- result = runtest(test, verbose, quiet, huntrleaks, debug,
+- output_on_failure=verbose3,
+- failfast=failfast, match_tests=match_tests)
++ result = _runtest(test, verbose, quiet, huntrleaks, debug,
++ output_on_failure=verbose3,
++ failfast=failfast, match_tests=match_tests)
+ accumulate_result(test, result)
+ except KeyboardInterrupt:
+ interrupted = True
+@@ -709,7 +754,7 @@
+ sys.stdout.flush()
+ try:
+ verbose = True
+- ok = runtest(test, True, quiet, huntrleaks, debug)
++ ok = _runtest(test, True, quiet, huntrleaks, debug)
+ except KeyboardInterrupt:
+ # print a newline separate from the ^C
+ print()
+@@ -1077,8 +1122,9 @@
+ for name, get, restore in self.resource_info():
+ current = get()
+ original = saved_values.pop(name)
+- # Check for changes to the resource's value
+- if current != original:
++ # Check for changes to the resource's value. test_site is always run
++ # in a subprocess and is allowed to change os.environ and sys.path.
++ if current != original and self.testname != "test_site":
+ self.changed = True
+ restore(original)
+ if not self.quiet:
+--- Lib/test/test_site.py
++++ Lib/test/test_site.py
+@@ -8,6 +8,7 @@
+ from test.support import run_unittest, TESTFN, EnvironmentVarGuard
+ from test.support import captured_stderr
+ import builtins
++import imp
+ import os
+ import sys
+ import re
+@@ -21,6 +22,9 @@
+ # already.
+ if "site" in sys.modules:
+ import site
++ if "_PYTHONNOSITEPACKAGES" in os.environ:
++ del os.environ["_PYTHONNOSITEPACKAGES"]
++ imp.reload(site)
+ else:
+ raise unittest.SkipTest("importation of site.py suppressed")
+
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -783,7 +783,7 @@
+
+ TESTOPTS= -l $(EXTRATESTOPTS)
+ TESTPROG= $(srcdir)/Lib/test/regrtest.py
+-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -R -bb $(TESTPYTHONOPTS)
++TESTPYTHON= _PYTHONNOSITEPACKAGES=1 $(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -R -bb $(TESTPYTHONOPTS)
+ test: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
View
167 dev-lang/python/files/3.2-20120729/23_all_h2py_encoding.patch
@@ -0,0 +1,167 @@
+http://bugs.python.org/issue13032
+
+--- Tools/scripts/h2py.py
++++ Tools/scripts/h2py.py
+@@ -23,55 +23,56 @@
+
+ import sys, re, getopt, os
+
+-p_define = re.compile('^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+')
++p_define = re.compile(b'^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+')
+
+ p_macro = re.compile(
+- '^[\t ]*#[\t ]*define[\t ]+'
+- '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
++ b'^[\t ]*#[\t ]*define[\t ]+'
++ b'([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
+
+-p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
++p_include = re.compile(b'^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
+
+-p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
+-p_cpp_comment = re.compile('//.*')
++p_comment = re.compile(br'/\*([^*]+|\*+[^/])*(\*+/)?')
++p_cpp_comment = re.compile(b'//.*')
+
+ ignores = [p_comment, p_cpp_comment]
+
+-p_char = re.compile(r"'(\\.[^\\]*|[^\\])'")
++p_char = re.compile(br"'(\\.[^\\]*|[^\\])'")
+
+-p_hex = re.compile(r"0x([0-9a-fA-F]+)L?")
++p_hex = re.compile(br"0x([0-9a-fA-F]+)L?")
+
+ filedict = {}
+ importable = {}
+
+ try:
+- searchdirs=os.environ['include'].split(';')
++ searchdirs=os.environb[b'include'].split(b';')
+ except KeyError:
+ try:
+- searchdirs=os.environ['INCLUDE'].split(';')
++ searchdirs=os.environb[b'INCLUDE'].split(b';')
+ except KeyError:
+- searchdirs=['/usr/include']
++ searchdirs=[b'/usr/include']
+
+ def main():
+ global filedict
+ opts, args = getopt.getopt(sys.argv[1:], 'i:')
+ for o, a in opts:
+ if o == '-i':
+- ignores.append(re.compile(a))
++ ignores.append(re.compile(a.encode()))
+ if not args:
+ args = ['-']
+ for filename in args:
+ if filename == '-':
+ sys.stdout.write('# Generated by h2py from stdin\n')
+- process(sys.stdin, sys.stdout)
++ process(sys.stdin.buffer, sys.stdout.buffer)
+ else:
+- fp = open(filename, 'r')
++ filename = filename.encode()
++ fp = open(filename, 'rb')
+ outfile = os.path.basename(filename)
+- i = outfile.rfind('.')
++ i = outfile.rfind(b'.')
+ if i > 0: outfile = outfile[:i]
+ modname = outfile.upper()
+- outfile = modname + '.py'
+- outfp = open(outfile, 'w')
+- outfp.write('# Generated by h2py from %s\n' % filename)
++ outfile = modname + b'.py'
++ outfp = open(outfile, 'wb')
++ outfp.write(b'# Generated by h2py from ' + filename + b'\n')
+ filedict = {}
+ for dir in searchdirs:
+ if filename[:len(dir)] == dir:
+@@ -85,9 +86,9 @@
+ def pytify(body):
+ # replace ignored patterns by spaces
+ for p in ignores:
+- body = p.sub(' ', body)
++ body = p.sub(b' ', body)
+ # replace char literals by ord(...)
+- body = p_char.sub("ord('\\1')", body)
++ body = p_char.sub(b"ord('\\1')", body)
+ # Compute negative hexadecimal constants
+ start = 0
+ UMAX = 2*(sys.maxsize+1)
+@@ -98,7 +99,7 @@
+ val = int(body[slice(*m.span(1))], 16)
+ if val > sys.maxsize:
+ val -= UMAX
+- body = body[:s] + "(" + str(val) + ")" + body[e:]
++ body = body[:s] + b"(" + str(val).encode() + b")" + body[e:]
+ start = s + 1
+ return body
+
+@@ -111,7 +112,7 @@
+ match = p_define.match(line)
+ if match:
+ # gobble up continuation lines
+- while line[-2:] == '\\\n':
++ while line[-2:] == b'\\\n':
+ nextline = fp.readline()
+ if not nextline: break
+ lineno = lineno + 1
+@@ -120,11 +121,11 @@
+ body = line[match.end():]
+ body = pytify(body)
+ ok = 0
+- stmt = '%s = %s\n' % (name, body.strip())
++ stmt = name + b' = ' + body.strip() + b'\n'
+ try:
+ exec(stmt, env)
+ except:
+- sys.stderr.write('Skipping: %s' % stmt)
++ sys.stderr.buffer.write(b'Skipping: ' + stmt)
+ else:
+ outfp.write(stmt)
+ match = p_macro.match(line)
+@@ -132,11 +133,11 @@
+ macro, arg = match.group(1, 2)
+ body = line[match.end():]
+ body = pytify(body)
+- stmt = 'def %s(%s): return %s\n' % (macro, arg, body)
++ stmt = b'def ' + macro + b'(' + arg + b'): return ' + body + b'\n'
+ try:
+ exec(stmt, env)
+ except:
+- sys.stderr.write('Skipping: %s' % stmt)
++ sys.stderr.buffer.write(b'Skipping: ' + stmt)
+ else:
+ outfp.write(stmt)
+ match = p_include.match(line)
+@@ -145,23 +146,24 @@
+ a, b = regs[1]
+ filename = line[a:b]
+ if filename in importable:
+- outfp.write('from %s import *\n' % importable[filename])
++ outfp.write(b'from ' + importable[filename] + b' import *\n')
+ elif filename not in filedict:
+ filedict[filename] = None
+ inclfp = None
+ for dir in searchdirs:
+ try:
+- inclfp = open(dir + '/' + filename)
++ inclfp = open(dir + b'/' + filename, 'rb')
+ break
+ except IOError:
+ pass
+ if inclfp:
+ outfp.write(
+- '\n# Included from %s\n' % filename)
++ b'\n# Included from ' + filename + b'\n')
+ process(inclfp, outfp, env)
++ inclfp.close()
+ else:
+- sys.stderr.write('Warning - could not find file %s\n' %
+- filename)
++ sys.stderr.buffer.write(b'Warning - could not find file ' +
++ filename + b'\n')
+
+ if __name__ == '__main__':
+ main()
View
89 dev-lang/python/files/3.2-20120729/41_all_crosscompile.patch
@@ -0,0 +1,89 @@
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -191,6 +191,7 @@
+
+ PYTHON= python$(EXE)
+ BUILDPYTHON= python$(BUILDEXE)
++HOSTPYTHON= $(BUILDPYTHON)
+
+ # The task to run while instrument when building the profile-opt target
+ PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
+@@ -233,6 +234,7 @@
+ ##########################################################################
+ # Parser
+ PGEN= Parser/pgen$(EXE)
++HOSTPGEN= $(PGEN)
+
+ POBJS= \
+ Parser/acceler.o \
+@@ -437,7 +439,7 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ @case $$MAKEFLAGS in \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
+ # Build the platform-specific modules
+@@ -606,9 +608,9 @@
+
+ # Use a stamp file to prevent make -j invoking pgen twice
+ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+-Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
++Parser/pgen.stamp: $(HOSTPGEN) $(GRAMMAR_INPUT)
+ -@$(INSTALL) -d Include
+- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ -touch Parser/pgen.stamp
+
+ $(PGEN): $(PGENOBJS)
+@@ -1029,25 +1031,25 @@
+ $(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ fi
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
++ ./$(HOSTPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ ./$(HOSTPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
++ ./$(HOSTPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ ./$(HOSTPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
++ ./$(HOSTPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+
+ python-config: $(srcdir)/Misc/python-config.in
+ # Substitution happens here, as the completely-expanded BINDIR
+@@ -1119,7 +1121,7 @@
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++ $(RUNSHARED) ./$(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --install-platlib=$(DESTSHARED) \
+--- setup.py
++++ setup.py
+@@ -349,6 +349,7 @@
+ try:
+ imp.load_dynamic(ext.name, ext_filename)
+ except ImportError as why:
++ return
+ self.failed.append(ext.name)
+ self.announce('*** WARNING: renaming "%s" since importing it'
+ ' failed: %s' % (ext.name, why), level=3)
View
166 dev-lang/python/files/3.2-20120729/61_all_process_data.patch
@@ -0,0 +1,166 @@
+GENTOO_PYTHON_PROCESS_NAME environmental variable is set by python-wrapper and wrapper scripts generated by
+python_generate_wrapper_scripts() and specifies process name.
+GENTOO_PYTHON_WRAPPER_SCRIPT_PATH environmental variable is set by wrapper scripts generated by
+python_generate_wrapper_scripts() and specifies sys.argv[0] in target executables.
+GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variable is set by wrapper scripts generated by
+python_generate_wrapper_scripts() and specifies paths to actually executed scripts.
+GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION environmental variable is used by wrapper scripts generated by
+python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variable.
+
+--- Modules/main.c
++++ Modules/main.c
+@@ -331,6 +331,7 @@
+ int version = 0;
+ int saw_unbuffered_flag = 0;
+ PyCompilerFlags cf;
++ char *target_script_name = getenv("GENTOO_PYTHON_TARGET_SCRIPT_PATH");
+
+ cf.cf_flags = 0;
+
+@@ -561,7 +562,17 @@
+ filename = argv[_PyOS_optind];
+
+ #else
+- filename = argv[_PyOS_optind];
++ if (target_script_name != NULL && *target_script_name != '\0') {
++ size_t length = strlen(target_script_name);
++ wchar_t *wcs_target_script_name = (wchar_t *) calloc(length + 1, sizeof(wchar_t));
++ char *old_locale = setlocale(LC_CTYPE, NULL);
++ setlocale(LC_CTYPE, "");
++ if (mbstowcs(wcs_target_script_name, target_script_name, length) >= 0)
++ filename = wcs_target_script_name;
++ setlocale(LC_CTYPE, old_locale);
++ }
++ if (filename == NULL)
++ filename = argv[_PyOS_optind];
+ #endif