Skip to content
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: dab470896a9119a8641fb77515b7fa175dea86fc
  foo-overlay: 49364501b49e209c1e5602ddde1dd6531e118fab
  bar-overlay: 78a0865873ba50e93705d46779fd9344e60a9af3
  flora: 402adb18eb1a49ad9a837e7d2fa42c784f6a6add
  lcd-filtering: dd3d9b094dbfc726ee9b3d886783a18b92f899fd
  mythtv: 00027cc812a879fe67e687843f201cd95e000a94
  • Loading branch information...
1 parent 704748e commit dd8d288f7d1f36080afd0d8793edb730da90a8cf @danielrobbins danielrobbins committed
Showing with 1,422 additions and 1,598 deletions.
  1. +9 −11 app-arch/xz-utils/xz-utils-5.0.4.ebuild
  2. +7 −9 app-arch/xz-utils/xz-utils-9999.ebuild
  3. +0 −1 app-cdr/cdrtools/Manifest
  4. +0 −131 app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
  5. +21 −0 app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
  6. +20 −33 app-editors/leafpad/leafpad-0.8.18.1.ebuild
  7. +1 −1 app-emulation/virtualbox-additions/Manifest
  8. +5 −3 ...ion/virtualbox-additions/{virtualbox-additions-4.1.20.ebuild → virtualbox-additions-4.2.0.ebuild}
  9. +4 −4 app-emulation/virtualbox-bin/Manifest
  10. +10 −8 app-emulation/virtualbox-bin/{virtualbox-bin-4.1.20.ebuild → virtualbox-bin-4.2.0.ebuild}
  11. +1 −1 app-emulation/virtualbox-extpack-oracle/Manifest
  12. +6 −4 ...extpack-oracle/{virtualbox-extpack-oracle-4.1.20.ebuild → virtualbox-extpack-oracle-4.2.0.ebuild}
  13. +2 −1 app-emulation/virtualbox-guest-additions/Manifest
  14. +1 −1 ...t-additions/{virtualbox-guest-additions-4.1.20.ebuild → virtualbox-guest-additions-4.1.22.ebuild}
  15. +201 −0 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild
  16. +1 −1 app-emulation/virtualbox-modules/Manifest
  17. +1 −1 ...emulation/virtualbox-modules/{virtualbox-modules-4.1.20.ebuild → virtualbox-modules-4.2.0.ebuild}
  18. +1 −1 app-emulation/virtualbox/Manifest
  19. +130 −0 app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
  20. +7 −8 app-emulation/virtualbox/{virtualbox-4.1.20-r1.ebuild → virtualbox-4.2.0.ebuild}
  21. +39 −0 app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch
  22. +3 −1 app-misc/mc/{mc-4.8.5.ebuild → mc-4.8.5-r1.ebuild}
  23. +11 −0 app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
  24. +2 −2 app-office/calligra/calligra-2.5.2.ebuild
  25. +2 −2 app-office/calligra/calligra-2.5.49.9999.ebuild
  26. +2 −2 app-office/calligra/calligra-9999.ebuild
  27. +1 −0 dev-cpp/tbb/Manifest
  28. +231 −0 dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
  29. +3 −3 dev-cpp/tbb/tbb-4.0.297.ebuild
  30. +120 −0 dev-cpp/tbb/tbb-4.1.20120718.ebuild
  31. +0 −1 dev-db/libdbi-drivers/Manifest
  32. +0 −20 dev-db/libdbi-drivers/files/libdbi-drivers-0.8.1-oci8.diff
  33. +0 −65 dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
  34. +0 −86 dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
  35. +0 −96 dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
  36. +53 −64 dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
  37. +0 −1 dev-db/libdbi/Manifest
  38. +0 −32 dev-db/libdbi/libdbi-0.8.1.ebuild
  39. +20 −16 dev-db/libdbi/libdbi-0.8.4.ebuild
  40. +1 −2 dev-embedded/msp430-binutils/Manifest
  41. +0 −25 dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120224.ebuild
  42. +3 −3 ...msp430-binutils/{msp430-binutils-2.21.1_p20120330.ebuild → msp430-binutils-2.22_p20120911.ebuild}
  43. +1 −0 dev-embedded/msp430-gcc/Manifest
  44. +28 −0 dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120911.ebuild
  45. +6 −6 dev-lang/yap/Manifest
  46. +2 −2 dev-lang/yap/yap-6.3.2.ebuild
  47. +0 −2 dev-libs/iniparser/Manifest
  48. +0 −27 dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
  49. +0 −49 dev-libs/iniparser/files/iniparser-3.0b-makefile.patch
  50. +0 −49 dev-libs/iniparser/iniparser-3.0.0.ebuild
  51. +0 −47 dev-libs/iniparser/iniparser-3.0b-r1.ebuild
  52. +0 −2 dev-libs/libburn/Manifest
  53. +0 −44 dev-libs/libburn/libburn-1.1.8.ebuild
  54. +0 −41 dev-libs/libburn/libburn-1.2.2.ebuild
  55. +0 −2 dev-libs/libisoburn/Manifest
  56. +0 −55 dev-libs/libisoburn/libisoburn-1.1.8.ebuild
  57. +0 −52 dev-libs/libisoburn/libisoburn-1.2.2.ebuild
  58. +0 −2 dev-libs/libisofs/Manifest
  59. +0 −40 dev-libs/libisofs/libisofs-1.1.6.ebuild
  60. +0 −40 dev-libs/libisofs/libisofs-1.2.2.ebuild
  61. +24 −0 dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.490.0.ebuild
  62. +1 −0 dev-perl/DateTime-TimeZone/Manifest
  63. +44 −0 dev-perl/Email-Sender/Email-Sender-0.120.2.ebuild
  64. +1 −0 dev-perl/Email-Sender/Manifest
  65. +1 −0 dev-perl/Perl6-Junction/Manifest
  66. +17 −0 dev-perl/Perl6-Junction/Perl6-Junction-1.500.0.ebuild
  67. +1 −0 dev-perl/Starlet/Manifest
  68. +30 −0 dev-perl/Starlet/Starlet-0.160.0.ebuild
  69. +1 −0 dev-perl/Test-use-ok/Manifest
  70. +18 −0 dev-perl/Test-use-ok/Test-use-ok-0.110.0.ebuild
  71. +2 −2 dev-util/qt-creator/qt-creator-2.5.2.ebuild
  72. +6 −2 eclass/ghc-package.eclass
  73. +11 −16 eclass/java-ant-2.eclass
  74. +2 −2 games-fps/xonotic/Manifest
  75. +3 −2 games-fps/xonotic/xonotic-0.6.0.ebuild
  76. +1 −2 games-simulation/openttd/openttd-1.2.0.ebuild
  77. +1 −2 games-simulation/openttd/openttd-1.2.2.ebuild
  78. +0 −1 media-sound/puddletag/Manifest
  79. +1 −0 media-sound/puddletag/metadata.xml
  80. +3 −2 media-sound/puddletag/puddletag-1.0.0.ebuild
  81. +0 −57 media-sound/puddletag/puddletag-1.0.0_beta6.ebuild
  82. +5 −3 media-video/libav/libav-9999.ebuild
  83. +1 −0 media-video/libav/metadata.xml
  84. +0 −82 media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
  85. +1 −1 metadata/dtd/timestamp.chk
  86. +1 −1 metadata/glsa/timestamp.chk
  87. +1 −1 metadata/md5-cache/app-accessibility/freetts-1.2.1-r1
  88. +1 −1 metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
  89. +1 −1 metadata/md5-cache/app-admin/389-admin-console-1.1.7
  90. +1 −1 metadata/md5-cache/app-admin/389-admin-console-1.1.8
  91. +1 −1 metadata/md5-cache/app-admin/389-console-1.1.6
  92. +1 −1 metadata/md5-cache/app-admin/389-console-1.1.7
  93. +1 −1 metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1
  94. +1 −1 metadata/md5-cache/app-admin/389-ds-console-1.2.6
  95. +1 −1 metadata/md5-cache/app-admin/haskell-updater-0.9.1.0
  96. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.1.0.0
  97. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.1.3.0
  98. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.2.0.5
  99. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.2.0.5-r1
  100. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.2.0.6
  101. +1 −1 metadata/md5-cache/app-admin/haskell-updater-1.2.0.7
  102. +3 −3 metadata/md5-cache/app-arch/xz-utils-5.0.4
  103. +2 −2 metadata/md5-cache/app-arch/xz-utils-9999
  104. +1 −1 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r2
  105. +1 −1 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r3
  106. +1 −1 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
  107. +0 −13 metadata/md5-cache/app-cdr/cdrtools-3.01_alpha07
  108. +1 −1 metadata/md5-cache/app-crypt/jacksum-1.7.0
  109. +1 −1 metadata/md5-cache/app-editors/jedit-4.3.2
  110. +1 −1 metadata/md5-cache/app-editors/jedit-4.4.2
  111. +1 −1 metadata/md5-cache/app-editors/jedit-4.4.2-r1
  112. +1 −1 metadata/md5-cache/app-editors/jedit-4.5.2
  113. +1 −1 metadata/md5-cache/app-editors/jext-5.0
  114. +9 −9 metadata/md5-cache/app-editors/leafpad-0.8.18.1
  115. +1 −1 metadata/md5-cache/app-emacs/jde-2.4.0.1
  116. +1 −1 metadata/md5-cache/app-emacs/jde-2.4.1_pre20110622
  117. +5 −5 metadata/md5-cache/app-emulation/{virtualbox-4.1.20-r1 → virtualbox-4.2.0}
  118. +2 −2 metadata/md5-cache/app-emulation/{virtualbox-additions-4.1.20 → virtualbox-additions-4.2.0}
  119. +0 −14 metadata/md5-cache/app-emulation/virtualbox-bin-4.1.20
  120. +14 −0 metadata/md5-cache/app-emulation/virtualbox-bin-4.2.0
  121. +3 −3 ...data/md5-cache/app-emulation/{virtualbox-extpack-oracle-4.1.20 → virtualbox-extpack-oracle-4.2.0}
  122. +4 −4 ...a/md5-cache/app-emulation/{virtualbox-guest-additions-4.1.20 → virtualbox-guest-additions-4.1.22}
  123. +13 −0 metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.0
  124. +2 −2 metadata/md5-cache/app-emulation/{virtualbox-modules-4.1.20 → virtualbox-modules-4.2.0}
  125. +1 −1 metadata/md5-cache/app-misc/bfm-1.2-r1
  126. +1 −1 metadata/md5-cache/app-misc/freemind-0.8.0-r3
  127. +1 −1 metadata/md5-cache/app-misc/freemind-0.9.0
  128. +1 −1 metadata/md5-cache/app-misc/freemind-0.9.0-r1
  129. +1 −1 metadata/md5-cache/app-misc/freemind-0.9.0_rc6
  130. +1 −1 metadata/md5-cache/app-misc/freemind-0.9.0_rc7
  131. +1 −1 metadata/md5-cache/app-misc/jbidwatcher-1.0.2-r1
  132. +1 −1 metadata/md5-cache/app-misc/{mc-4.8.5 → mc-4.8.5-r1}
  133. +1 −1 metadata/md5-cache/app-office/borg-1.7.4
  134. +1 −1 metadata/md5-cache/app-office/calligra-2.5.2
  135. +1 −1 metadata/md5-cache/app-office/calligra-2.5.49.9999
  136. +1 −1 metadata/md5-cache/app-office/calligra-9999
  137. +1 −1 metadata/md5-cache/app-office/hourglass-0.7.1
  138. +1 −1 metadata/md5-cache/app-office/hourglass-0.7.2
  139. +1 −1 metadata/md5-cache/app-text/epubcheck-1.1
  140. +1 −1 metadata/md5-cache/app-text/jabref-2.3.1
  141. +1 −1 metadata/md5-cache/app-text/jabref-2.5
  142. +1 −1 metadata/md5-cache/app-text/jabref-2.6
  143. +1 −1 metadata/md5-cache/app-text/jabref-2.6_beta3
  144. +1 −1 metadata/md5-cache/app-text/jing-20030619-r3
  145. +1 −1 metadata/md5-cache/app-text/jpdftweak-0.9
  146. +1 −1 metadata/md5-cache/app-text/pandoc-1.8.1.1-r1
  147. +1 −1 metadata/md5-cache/app-text/pandoc-1.9.1.2
  148. +1 −1 metadata/md5-cache/app-text/pandoc-1.9.2
  149. +1 −1 metadata/md5-cache/app-text/pandoc-1.9.3
  150. +1 −1 metadata/md5-cache/app-text/pandoc-1.9.4.1-r2
  151. +1 −1 metadata/md5-cache/app-text/trang-20091111
  152. +1 −1 metadata/md5-cache/app-text/zemberek-server-0.7.1
  153. +2 −3 metadata/md5-cache/dev-cpp/tbb-4.0.297
  154. +12 −0 metadata/md5-cache/dev-cpp/tbb-4.1.20120718
  155. +1 −1 metadata/md5-cache/dev-db/apgdiff-1.4
  156. +1 −1 metadata/md5-cache/dev-db/apgdiff-2.2.1
  157. +1 −1 metadata/md5-cache/dev-db/apgdiff-2.2.2
  158. +1 −1 metadata/md5-cache/dev-db/apgdiff-2.3
  159. +1 −1 metadata/md5-cache/dev-db/db-je-3.3.75
  160. +1 −1 metadata/md5-cache/dev-db/henplus-0.9.7-r1
  161. +1 −1 metadata/md5-cache/dev-db/henplus-0.9.8
  162. +1 −1 metadata/md5-cache/dev-db/hsqldb-1.8.1.2-r1
  163. +1 −1 metadata/md5-cache/dev-db/hsqldb-1.8.1.3
  164. +1 −1 metadata/md5-cache/dev-db/jxtray-0.5-r4
  165. +0 −10 metadata/md5-cache/dev-db/libdbi-0.8.1
  166. +4 −4 metadata/md5-cache/dev-db/libdbi-0.8.4
  167. +0 −12 metadata/md5-cache/dev-db/libdbi-drivers-0.8.1-r1
  168. +0 −12 metadata/md5-cache/dev-db/libdbi-drivers-0.8.1-r2
  169. +0 −13 metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r1
  170. +8 −7 metadata/md5-cache/dev-db/libdbi-drivers-0.8.3-r2
  171. +1 −1 metadata/md5-cache/dev-db/octopus-3.0.1-r3
  172. +1 −1 metadata/md5-cache/dev-embedded/arduino-1.0.1
  173. +0 −12 metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120224
  174. +2 −2 metadata/md5-cache/dev-embedded/{msp430-binutils-2.21.1_p20120330 → msp430-binutils-2.22_p20120911}
  175. +14 −0 metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
  176. +1 −1 metadata/md5-cache/dev-haskell/alex-2.3.5
  177. +1 −1 metadata/md5-cache/dev-haskell/alex-3.0.2
  178. +1 −1 metadata/md5-cache/dev-haskell/alsa-core-0.5
  179. +1 −1 metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1
  180. +1 −1 metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2
  181. +1 −1 metadata/md5-cache/dev-haskell/alut-2.1.0.0
  182. +1 −1 metadata/md5-cache/dev-haskell/alut-2.2.0.0
  183. +1 −1 metadata/md5-cache/dev-haskell/ansi-terminal-0.5.0
  184. +1 −1 metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
  185. +1 −1 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.5.1
  186. +1 −1 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.3
  187. +1 −1 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
  188. +1 −1 metadata/md5-cache/dev-haskell/arrows-0.2.1
  189. +1 −1 metadata/md5-cache/dev-haskell/arrows-0.4.2.0
  190. +1 −1 metadata/md5-cache/dev-haskell/arrows-0.4.4.0
  191. +1 −1 metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.3
  192. +1 −1 metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.1
  193. +1 −1 metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
  194. +1 −1 metadata/md5-cache/dev-haskell/binary-0.5.0.2
  195. +1 −1 metadata/md5-cache/dev-haskell/binary-0.5.1.0
  196. +1 −1 metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0
  197. +1 −1 metadata/md5-cache/dev-haskell/blaze-html-0.4.3.1
  198. +1 −1 metadata/md5-cache/dev-haskell/blaze-html-0.4.3.3
  199. +1 −1 metadata/md5-cache/dev-haskell/blaze-html-0.5.0.0
  200. +1 −1 metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.0
  201. +1 −1 metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.8
  202. +1 −1 metadata/md5-cache/dev-haskell/bytestring-show-0.3.5
  203. +1 −1 metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.1
  204. +1 −1 metadata/md5-cache/dev-haskell/bzlib-0.5.0.1
  205. +1 −1 metadata/md5-cache/dev-haskell/bzlib-0.5.0.2
  206. +1 −1 metadata/md5-cache/dev-haskell/bzlib-0.5.0.3
  207. +1 −1 metadata/md5-cache/dev-haskell/c2hs-0.16.3
  208. +1 −1 metadata/md5-cache/dev-haskell/c2hs-0.16.3-r1
  209. +1 −1 metadata/md5-cache/dev-haskell/cabal-1.10.2.0
  210. +1 −1 metadata/md5-cache/dev-haskell/cabal-1.14.0
  211. +1 −1 metadata/md5-cache/dev-haskell/cabal-1.8.0.6-r1
  212. +1 −1 metadata/md5-cache/dev-haskell/cabal-install-0.10.2-r2
  213. +1 −1 metadata/md5-cache/dev-haskell/cabal-install-0.14.0
  214. +1 −1 metadata/md5-cache/dev-haskell/cairo-0.12.0
  215. +1 −1 metadata/md5-cache/dev-haskell/cairo-0.12.3
  216. +1 −1 metadata/md5-cache/dev-haskell/cairo-0.12.3.1
  217. +1 −1 metadata/md5-cache/dev-haskell/cgi-2006.9.6
  218. +1 −1 metadata/md5-cache/dev-haskell/cgi-3001.1.1
  219. +1 −1 metadata/md5-cache/dev-haskell/cgi-3001.1.5.1
  220. +1 −1 metadata/md5-cache/dev-haskell/cgi-3001.1.7.1
  221. +1 −1 metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
  222. +1 −1 metadata/md5-cache/dev-haskell/citeproc-hs-0.3.2
  223. +1 −1 metadata/md5-cache/dev-haskell/citeproc-hs-0.3.4
  224. +1 −1 metadata/md5-cache/dev-haskell/cmdlib-0.3.5
  225. +1 −1 metadata/md5-cache/dev-haskell/configfile-1.0.6
  226. +1 −1 metadata/md5-cache/dev-haskell/configfile-1.1.1
  227. +1 −1 metadata/md5-cache/dev-haskell/convertible-1.0.10.0
  228. +1 −1 metadata/md5-cache/dev-haskell/convertible-1.0.11.1
  229. +1 −1 metadata/md5-cache/dev-haskell/cpphs-1.12
  230. +1 −1 metadata/md5-cache/dev-haskell/cpphs-1.13.2
  231. +1 −1 metadata/md5-cache/dev-haskell/cpphs-1.13.3
  232. +1 −1 metadata/md5-cache/dev-haskell/crypto-4.2.4
  233. +1 −1 metadata/md5-cache/dev-haskell/crypto-4.2.5
  234. +1 −1 metadata/md5-cache/dev-haskell/curl-1.3.5
  235. +1 −1 metadata/md5-cache/dev-haskell/curl-1.3.7
  236. +1 −1 metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.2.1
  237. +1 −1 metadata/md5-cache/dev-haskell/dataenc-0.14.0.2
  238. +1 −1 metadata/md5-cache/dev-haskell/dataenc-0.14.0.3
  239. +1 −1 metadata/md5-cache/dev-haskell/dbus-core-0.9.2.1
  240. +1 −1 metadata/md5-cache/dev-haskell/deepseq-1.1.0.2
  241. +1 −1 metadata/md5-cache/dev-haskell/deepseq-1.3.0.0
  242. +1 −1 metadata/md5-cache/dev-haskell/diff-0.1.3
  243. +1 −1 metadata/md5-cache/dev-haskell/digest-0.0.0.8
  244. +1 −1 metadata/md5-cache/dev-haskell/digest-0.0.0.9
  245. +1 −1 metadata/md5-cache/dev-haskell/digest-0.0.1.1
  246. +1 −1 metadata/md5-cache/dev-haskell/dlist-0.5
  247. +1 −1 metadata/md5-cache/dev-haskell/drift-2.2.0
  248. +1 −1 metadata/md5-cache/dev-haskell/drift-2.2.3
  249. +1 −1 metadata/md5-cache/dev-haskell/edit-distance-0.2.1
  250. +1 −1 metadata/md5-cache/dev-haskell/editline-0.2.1.0
  251. +1 −1 metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
  252. +1 −1 metadata/md5-cache/dev-haskell/fgl-5.4.1.1
  253. +1 −1 metadata/md5-cache/dev-haskell/fgl-5.4.2.3
  254. +1 −1 metadata/md5-cache/dev-haskell/fgl-5.4.2.4
  255. +1 −1 metadata/md5-cache/dev-haskell/frown-0.6.1-r1
  256. +1 −1 metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.8
  257. +1 −1 metadata/md5-cache/dev-haskell/gio-0.12.0
  258. +1 −1 metadata/md5-cache/dev-haskell/gio-0.12.3
  259. +1 −1 metadata/md5-cache/dev-haskell/glade-0.12.0
  260. +1 −1 metadata/md5-cache/dev-haskell/glade-0.12.1
  261. +1 −1 metadata/md5-cache/dev-haskell/glib-0.12.0
  262. +1 −1 metadata/md5-cache/dev-haskell/glib-0.12.3
  263. +1 −1 metadata/md5-cache/dev-haskell/glib-0.12.3.1
  264. +1 −1 metadata/md5-cache/dev-haskell/gluraw-1.2.0.0
  265. +1 −1 metadata/md5-cache/dev-haskell/glut-2.1.1.1
  266. +1 −1 metadata/md5-cache/dev-haskell/glut-2.1.1.2
  267. +1 −1 metadata/md5-cache/dev-haskell/glut-2.3.0.0
  268. +1 −1 metadata/md5-cache/dev-haskell/gtk-0.12.0
  269. +1 −1 metadata/md5-cache/dev-haskell/gtk-0.12.3
  270. +1 −1 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.0
  271. +1 −1 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3-r3
  272. +1 −1 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3.1
  273. +1 −1 metadata/md5-cache/dev-haskell/haddock-2.10.0
  274. +1 −1 metadata/md5-cache/dev-haskell/haddock-2.10.0-r1
  275. +1 −1 metadata/md5-cache/dev-haskell/haddock-2.4.2
  276. +1 −1 metadata/md5-cache/dev-haskell/haddock-2.6.1
  277. +1 −1 metadata/md5-cache/dev-haskell/haddock-2.9.2
  278. +1 −1 metadata/md5-cache/dev-haskell/happy-1.18.2
  279. +1 −1 metadata/md5-cache/dev-haskell/happy-1.18.4
  280. +1 −1 metadata/md5-cache/dev-haskell/happy-1.18.6
  281. +1 −1 metadata/md5-cache/dev-haskell/happy-1.18.9
  282. +1 −1 metadata/md5-cache/dev-haskell/harp-0.2
  283. +1 −1 metadata/md5-cache/dev-haskell/harp-0.4
  284. +1 −1 metadata/md5-cache/dev-haskell/hashable-1.1.2.2
  285. +1 −1 metadata/md5-cache/dev-haskell/hashable-1.1.2.3
  286. +1 −1 metadata/md5-cache/dev-haskell/hashed-storage-0.4.13
  287. +1 −1 metadata/md5-cache/dev-haskell/hashed-storage-0.5.7
  288. +1 −1 metadata/md5-cache/dev-haskell/hashed-storage-0.5.9
  289. +1 −1 metadata/md5-cache/dev-haskell/hashtables-1.0.1.2
  290. +1 −1 metadata/md5-cache/dev-haskell/hashtables-1.0.1.3
  291. +1 −1 metadata/md5-cache/dev-haskell/hashtables-1.0.1.6
  292. +1 −1 metadata/md5-cache/dev-haskell/haskeline-0.6.2.2
  293. +1 −1 metadata/md5-cache/dev-haskell/haskeline-0.6.4.0
  294. +1 −1 metadata/md5-cache/dev-haskell/haskeline-0.6.4.6
  295. +1 −1 metadata/md5-cache/dev-haskell/haskeline-0.6.4.6-r1
  296. +1 −1 metadata/md5-cache/dev-haskell/haskeline-0.6.4.7
  297. +1 −1 metadata/md5-cache/dev-haskell/haskell-src-1.0.1.3
  298. +1 −1 metadata/md5-cache/dev-haskell/haskell-src-1.0.1.4
  299. +1 −1 metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5
  300. +1 −1 metadata/md5-cache/dev-haskell/haskell-src-exts-0.2
Sorry, we could not display the entire diff because too many files (1,677) changed.
View
20 app-arch/xz-utils/xz-utils-5.0.4.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-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.7 2012/09/09 15:59:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.8 2012/09/14 02:24:09 ottxor Exp $
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI="2"
+EAPI="4"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="http://git.tukaani.org/xz.git"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
- KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
fi
@@ -50,18 +50,16 @@ src_configure() {
}
src_install() {
- emake install DESTDIR="${D}" || die
- find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
- rm "${D}"/usr/share/doc/xz/COPYING* || die
- mv "${D}"/usr/share/doc/{xz,${PF}} || die
- prepalldocs
- dodoc AUTHORS ChangeLog NEWS README THANKS
+ default
+ find "${ED}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+ rm "${ED}"/usr/share/doc/xz/COPYING* || die
+ mv "${ED}"/usr/share/doc/{xz,${PF}} || die
}
pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+ preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
}
pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+ preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
}
View
16 app-arch/xz-utils/xz-utils-9999.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-arch/xz-utils/xz-utils-9999.ebuild,v 1.11 2012/05/17 04:05:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.12 2012/09/14 02:24:09 ottxor Exp $
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI="2"
+EAPI="4"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="http://git.tukaani.org/xz.git"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
fi
@@ -50,10 +50,8 @@ src_configure() {
}
src_install() {
- emake install DESTDIR="${D}" || die
- find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
- rm "${D}"/usr/share/doc/xz/COPYING* || die
- mv "${D}"/usr/share/doc/{xz,${PF}} || die
- prepalldocs
- dodoc AUTHORS ChangeLog NEWS README THANKS
+ default
+ find "${ED}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+ rm "${ED}"/usr/share/doc/xz/COPYING* || die
+ mv "${ED}"/usr/share/doc/{xz,${PF}} || die
}
View
1 app-cdr/cdrtools/Manifest
@@ -1,3 +1,2 @@
DIST cdrtools-3.00.tar.bz2 1978563 SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d SHA512 93887afd6c244814b7f6a623f0ac5b551934626163065a6f32aefe82aa7438450fd7a42737ef3cdaad3f18841c066d25e72e37891531dd0be5be328692712cec WHIRLPOOL a02750131e4ec55df10387a01dab3881afee669cd8b8ea65eaed4fdd82e6bd11040c6d79fc64ccc9377e787f5903ec92ea3ae81db1945554b65a8636737cc931
-DIST cdrtools-3.01a07.tar.bz2 2043525 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428 SHA512 670c5b191f35565a86ec4b55c78c3884f2157afd92a7d6f029371cbb252b1a7066ea3186de2586604cb96f4e618fadae6efb9bb1ac5819958cce543d4b9442db WHIRLPOOL d6f37ce8c448c1204491f24a6c5d7088cb5329eb0dbbc9de7aca1349994afb43762c543e6104f75ac0d64d18497c4c27de065871425fec042a1864f36161452a
DIST cdrtools-3.01a08.tar.bz2 2042834 SHA256 e503b0531c99644788cf11be694f311043fc9adb17612e3dccd2eefc23a16f41 SHA512 cf591d571c4f17d15927eece49780f875ef797a4d3c4df130340257ff2ce8df40377f88f8f3bc4301cb1b0b8927ee2a7f580e0a0f7f0652b5c88f0a10af214e8 WHIRLPOOL cbe680ebeec52716980c07b86a1d005197542e611dfcff770c2e9717005de3225980166f47e369cf46fadd91db5dac3e42b9a45f9567db91239641f2784f60d9
View
131 app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild,v 1.3 2012/04/28 17:12:59 billie Exp $
-
-EAPI=4
-
-inherit multilib eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl unicode"
-
-DEPEND="acl? ( virtual/acl )
- >=sys-devel/gettext-0.18.1.1
- !app-cdr/cdrkit"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-src_prepare() {
- # Remove profiled make files.
- rm -f $(find . -name '*_p.mk') || die "rm profiled"
-
- # Adjusting hardcoded paths.
- sed -i -e 's:opt/schily:usr:' \
- $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
- || die "sed opt/schily"
-
- sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
- $(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
- || die "sed doc"
-
- # Respect libdir.
- sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
- $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
- || die "sed multilib"
-
- # Do not install static libraries.
- sed -i -e 's:include\t\t.*rules.lib::' \
- $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
- || die "sed rules"
-
- # Respect CC/CXX variables.
- cd "${S}"/RULES
- local tcCC=$(tc-getCC)
- local tcCXX=$(tc-getCXX)
- sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
- rules1.top || die "sed rules1.top"
- sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
- -e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
- -e "/COPTOPT=/s/-O//" \
- -e 's/$(GCCOPTOPT)//' \
- cc-gcc.rul || die "sed cc-gcc.rul"
- sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
- rules.cnf || die "sed rules.cnf"
-
- # Create additional symlinks needed for some archs (armv4l already created)
- local t
- for t in armv4tl armv5l armv5tel armv6l armv7l ppc64 s390x; do
- ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
- ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
- done
-
- # Schily make setup.
- cd "${S}"/DEFAULTS
- local os="linux"
-
- sed -i \
- -e "s:/opt/schily:/usr:g" \
- -e "s:/usr/src/linux/include::g" \
- -e "s:bin:root:g" \
- Defaults.${os} || die "sed Schily make setup"
-}
-
-# skip obsolete configure script
-src_configure() { : ; }
-
-src_compile() {
- if use unicode; then
- local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
- if [[ -n ${flags} ]]; then
- append-flags ${flags}
- else
- ewarn "Your compiler does not support the options required to build"
- ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
- fi
- fi
-
- if ! use acl; then
- CFLAGS="${CFLAGS} -DNO_ACL"
- fi
-
- # LIB_ACL_TEST removed to support x86-fbsd
- # If not built with -j1, "sometimes" cdda2wav will not be built.
- emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
- LDOPTX="${LDFLAGS}" \
- INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
- RUNPATH="" GMAKE_NOWARN="true"
-}
-
-src_install() {
- # If not built with -j1, "sometimes" manpages are not installed.
- emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
- LDOPTX="${LDFLAGS}" \
- INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
- RUNPATH="" GMAKE_NOWARN="true" install
-
- # These symlinks are for compat with cdrkit.
- dosym schily /usr/include/scsilib
- dosym ../scg /usr/include/schily/scg
-
- dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
- cd "${S}"/cdda2wav
- docinto cdda2wav
- dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
- cd "${S}"/mkisofs
- docinto mkisofs
- dodoc ChangeLog* TODO
-
- # Remove man pages related to the build system
- rm -rvf "${D}"/usr/share/man/man5
-}
View
21 app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
@@ -0,0 +1,21 @@
+desktop-file-validate:
+
+leafpad.desktop: error: value "text/plain" for string list key "MimeType" in group "Desktop Entry"
+does not have a semicolon (';') as trailing character
+
+leafpad.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
+
+--- data/leafpad.desktop.in
++++ data/leafpad.desktop.in
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Leafpad
+ _Comment=Simple text editor
+ Exec=leafpad %f
+ Icon=leafpad
+ Terminal=false
+ Type=Application
+-MimeType=text/plain
++MimeType=text/plain;
+ Categories=GTK;Utility;TextEditor;
View
53 app-editors/leafpad/leafpad-0.8.18.1.ebuild
@@ -1,49 +1,36 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.4 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.5 2012/09/13 21:14:54 ssuominen Exp $
-EAPI=3
-inherit fdo-mime gnome2-utils
+EAPI=4
+inherit eutils fdo-mime gnome2-utils
-DESCRIPTION="Simple GTK+ Text Editor"
+DESCRIPTION="Legacy (stable) release of the GTK+ 2.x based codebase"
HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-SRC_URI="http://savannah.nongnu.org/download/leafpad/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="emacs"
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=emacs
-RDEPEND=">=x11-libs/gtk+-2.10:2
- virtual/libintl"
+RDEPEND="virtual/libintl
+ x11-libs/gtk+:2"
DEPEND="${RDEPEND}
- sys-devel/gettext
dev-util/intltool
+ sys-devel/gettext
virtual/pkgconfig"
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --enable-chooser \
- --enable-print \
- $(use_enable emacs)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README
-}
+DOCS="AUTHORS ChangeLog NEWS README"
-pkg_preinst() {
- gnome2_icon_savelist
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fdo.patch
}
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
+src_configure() {
+ econf --enable-chooser --enable-print $(use_enable emacs)
}
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
View
2 app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
DIST VBoxGuestAdditions_4.1.12.iso 50776064 SHA256 7dce13dd99c8b4757d56f5bada19a61a3ad50c69d7e0d9c245c0b88f50c0c245 SHA512 04f76ae6707b76662d12cf98dda2270470ef9281c750f0f7cd47e7648c2abe9c2808baf6ae80b1566a039201bf9485b7a539c03093f36629afa6cc80f6812d93 WHIRLPOOL e254b5f11b5dc03b845c131be4691550d82e880e8376f2400dc7ad1596c159aff5d42dcf540ecee85df736d25800b391b47fdec31c718d845e754847a9fa8a72
DIST VBoxGuestAdditions_4.1.18.iso 52164608 SHA256 0b670a698dcb427ebf69cdec1e040b26e93538e1ca76f58506c1db70308152ff SHA512 079840900997ad27079dbdfec0e5cc142befc96df9a587b7795f3a224549f0671f62908ae2862f00ca31ae7cd18fdb2a13b19c3aec23ca5cd0d5dc3059481878 WHIRLPOOL b8d3b23b8f4e568950c83d7c5c75048fd944e7bb222d4a9dd7c1bb071bc42e42fe2f6ce136b2e80c62aeb4063d6ab6480927ae44a181c99195e723e7f4d8672a
-DIST VBoxGuestAdditions_4.1.20.iso 52207616 SHA256 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494 SHA512 977410c193ab010af3d097495b0288effd0181552259f990c4c4588fb28de90e5d700cd0f76f151b898a353f86ec878ba091b401c6ed48220572b19a31cd8642 WHIRLPOOL aed5b12b788aed589df2811d0d270a36178cf5a369630e168d67b621f6f3e23f735b1eb33bf0c0c2e7b2c2b4c9b7d697b8c5874088b59272459d5b786e232c58
DIST VBoxGuestAdditions_4.1.22.iso 52207616 SHA256 5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46 SHA512 529e5f236a1c4bad9123941d8fc3b0d73f93309d42656bf72090282bd970843457af548323079e36ea95d14b8320b3aaafb3ae790da5694d22f538ff8aa1fcf3 WHIRLPOOL f826dd334cfcc25b64b0ecdfb6a5e15bed60d3ceb398710a1787ea43f154b72e1117840f448ba398dcfe149ce0897799b57f0cf1e1e8b070cc055bc9e98896f9
+DIST VBoxGuestAdditions_4.2.0.iso 55207936 SHA256 ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3 SHA512 e6d9241298297bac9fdcc0cbd8afba8d5075b531d966059ae7cf216cf4b1536e9320e773c0bbe3b376effa8b49bc189189607e85735149f73a7cacff5ad2d798 WHIRLPOOL 1fb8418151bc9ed323044834d65b042792a434d0e91cb873c07be03d85789b316979dd73b75d34967ccfce442717cddb54976467d1f7111e9a6662c4c2c7ce91
View
8 ...itions/virtualbox-additions-4.1.20.ebuild → ...ditions/virtualbox-additions-4.2.0.ebuild
@@ -1,17 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.20.ebuild,v 1.1 2012/08/21 09:18:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.0.ebuild,v 1.1 2012/09/13 19:41:15 polynomial-c Exp $
EAPI=2
inherit eutils
MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
DESCRIPTION="CD image containing guest additions for VirtualBox"
HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="PUEL"
SLOT="0"
View
8 app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,16 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881 SHA512 8156fb23fcb5aead17da3f68d1303339e80981466c92531a1255b0f97aaa3c09243c6f6802220cac9abb1ab70255a51b8d3bed479d1724f4350d043cbec27fd7 WHIRLPOOL 3607b3dc4d3dd1947b41fd5859b796873441bdde228d138d31b11865e21c750cdf7a329f0b13778ecf63d4b0b176b38f0d72fe0057ce217e8299c7737af62983
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.18-78361.tar.gz 10572216 SHA256 1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198 SHA512 aeb7d04fd485fe55390e43e4b20cb87d64640c96beefc3f3bfdc755a2c3622dbbd006a9186731898f36b30ceed7ea887729d48c55874f28c0b6cd96c1cc2dbc0 WHIRLPOOL 513a78b062d75d4cd3a36ed4835a7878f9bf7b0b13d8981dd6664f71cef8f6503457e4dd909203c549a4068fa1608c4ab402944d4de1674a278da13a84da0859
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.20-80170.tar.gz 10749918 SHA256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a SHA512 828e3142e20c727ee058c0e56cabe53458437f6addf7de4586e0e513d8423e3fdbd479bd90aaa8498e4cf973506c637095506cc77c37bad11c7360ec3565638b WHIRLPOOL 8b2dfa67d2caff8ce5a057cb762b78d1b2c5bd1abb15f05f82ee323a92f7932ad53d09a162da2f2163c503e2a6b65ff4c6796501c10fc9f359aea185afe1a544
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.0-80737.tar.gz 10828566 SHA256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218 SHA512 ef637feea9041bcd68e5937a5bcc092b99862e2b9baa95263630f5ae2c1999c0cd2522b83707fb462d7a32af6ab1dcc2bf9275fd15ac94947cc5189b92c3b64e WHIRLPOOL b0696b319dff29a050ca5520e39625fb0d956e45309a2c773f1b77ad2fab83f9d7fbef4adb3a27be9ddd50068a45e4df155013cf7b6c879a9caa9e34ecf8a7aa
DIST VirtualBox-4.1.12-77245-Linux_amd64.run 77250001 SHA256 006eabe522116abcce7af4b5ea6f32f862d3d95ab565e44e5077ab5ced62ba24 SHA512 42f74c47a405108b2a8360601a3a13bacc6cb3f223bbf12ba781f1f8f6e31160aab3c6c3cb4088bfe09d52c5287510285b2276746eb26df3408dc8787748305b WHIRLPOOL 121657f81057813168e182e6ad915a155b54948442f3302130b780e2a239800323e866a2a9d0f29d6c6a88e6c80fd16b9db1d049c09c9a232dbde697281ea4cf
DIST VirtualBox-4.1.12-77245-Linux_x86.run 77137358 SHA256 49890bf1077b3649181d1607372d5b92bcf347371e0631a4af6a43193492f047 SHA512 4c0938b947512f9563e4afdf4bf9e9d9a478d4bc4062a12aa082c4e1605755fd9804aa2a4c2ff8c16aee21e700825f0128b193d84f33d8eaf1084f52654d2f7e WHIRLPOOL 6e93dd0157ec92c8811367f8e73977a0b85f2dc50e1334c9f8e820a34f53c3a99a775cdf8777f23cb5cbc669e4429c5f255ceb4c02eb23b121d3ae6853d5eead
DIST VirtualBox-4.1.18-78361-Linux_amd64.run 78734802 SHA256 f45015f3b427a24195e8cbabb2158d26daecd6c03cd7437aacb5249500a2b425 SHA512 f584d7e00c115b4d45509895a6906154f0ce1b6e90366a6f04feeee8f7c1a11ccbbd9cd1d03bb749b39a3a278adff3ac2dd6301ff8d854c76591fc8b8a6f477d WHIRLPOOL 4557979bdf6131dc22fcc8c9617071d9c10d837da973903c8bb3eca27a9b7e3d2ec3e190df5607060508aa81721535f137e2fa65ba5550d04a12ed7d060aee13
DIST VirtualBox-4.1.18-78361-Linux_x86.run 78611917 SHA256 112d5eefb15fc96f9e2c3a85928a1984c022ef32bb8781536a7a06e33a80865a SHA512 9a5f688cc64fd409c32707a6c04cd859dfa2363240110481b7290ef74fd4ebdb4ddd2db47eb3bed0ef10315bcb5e0f275647e4ae777758726987b94387a0aca1 WHIRLPOOL 34c423a8849ddb14e4dbd8f734081ba407bf7b5a731fd970e79b74582d2e8756785bd6ec474b2a822ff8fdd30538f89e1c2465387bf8431d6d7dd18fa92e0434
-DIST VirtualBox-4.1.20-80170-Linux_amd64.run 78632402 SHA256 0c282c58d35aad41ac43b9fd0b33689a384d5ea21018d2824da63df9b3cf9241 SHA512 fcbc5a07dc2ef82de02c0b5f5fae33b6e5fa994912b6dc4121ab6dfc43a7d57179643d227b6d7c834e1e0f000ac02f2595b0a0323a4d1a7bb3b1eba086c0b154 WHIRLPOOL fb96eb5cc405002b2498175d5087e0002eccc00d7337efdf79d95310e2fe9947abee2be45ec58fa5d5029e68690826111858d4e917de29010d0737af7e7ba6ea
-DIST VirtualBox-4.1.20-80170-Linux_x86.run 78704078 SHA256 e084db553064fb85136df22d13f262fef602daca56b95799cef7df761310a8d5 SHA512 4d93bf250fec5d0be9e84795a22ceb592433223fa67520e67e1e797523149d251977a51c1589b71527d079d698cf045c12e0567b3662152ccb7ae266901af1b7 WHIRLPOOL 0f4c8726566015ba1a0eaf041b002dd5be9dba9dbbb43b88b6bc318ab150b03c444a2c3f73575d5d8328ead1116352bb05b1cad1148d90b9e1de46c2ced07f3b
DIST VirtualBox-4.1.22-80657-Linux_amd64.run 78693841 SHA256 d53a5cc2d1b9431d4f9443462b84549678e943be1d8b4a714d7844c741507c76 SHA512 cdd2920099c0c0349bc6750ab7cad67f23cfba109db62297ad8bede1e7a5658781a29ea1111c8ae1b07cf1eeaf2394baf419be1b9b174575f3c10c13aa9d9b68 WHIRLPOOL c532b3b48c9a0b8057c65db4cbd6e31f17e93a88a4bb5842f9b8c821e8f102d4e2b1bcbfd081ec6a1ecc95b697d8f7914542e8aefcebeb9b2137ad8edf267696
DIST VirtualBox-4.1.22-80657-Linux_x86.run 78632398 SHA256 a18a2b7723bc8c325149b5581ae36208211c7d8651269516d366db9cdafcd0ae SHA512 0f9dd4fc25828cec3ac3d2961b925a57dd88e0af1c3cf75c9199428b4090790ebd439015700b63def6c53b5acc94135e7766f36f29d6befcb03339d563fac054 WHIRLPOOL 76d06e577f2ee3d9ec0eea0b9800b618af97205ac9b036fe3f1c73b7ecccfbf6f57e49ddc224e9963eb048c5fe6e88cfedf9743b8af2df97137feb03e89fac36
+DIST VirtualBox-4.2.0-80737-Linux_amd64.run 80342468 SHA256 04030998f15b656e9b76064cde3e6cb43c5a41b1e25e700f123f5a629578fe5e SHA512 12230b1910cbf7d3ef7942fa262d96caeb0a5d97cc21b344933c2b21feb0883785d51134c2d14f904972595ca4655034408d57f2327024ba7c95abbc7e2c4152 WHIRLPOOL 2a92948b86514b684cf7116d9cf4ae880cb9b559ea5379ae7c7c1dbd652549a431ace9c77704fd7a916cafab18f5f3fec88383cea7164dfc18788e1802eb8585
+DIST VirtualBox-4.2.0-80737-Linux_x86.run 80158144 SHA256 d859981312c2b6ed9e596375fc180378763b09e5a3cf0d6dd61bc252789006c4 SHA512 755aa7efbe75e4bd83b04bd950955516d2a5462fd8b398092dbb8854cbba54ce22d8072b885abba883fc8c751a41ee7670c021ef72f530b726466fa3bddbbf0d WHIRLPOOL 101492d5e9b85ee7634d2b3b5cbd9f1aff258b12c951455ee969b2fe48768f48e90956a5dbcfaf8c83be6cf10f601fad6633c56a471a34762f8079f52db8a72d
DIST VirtualBoxSDK-4.1.12-77245.zip 8896345 SHA256 a490878e7bc2443c7e4b51115382a6c5b65cda44cfc449af1676778093b307fa SHA512 2409b0c0c090287e5251cb2cc54e3ad02ab53005b8e5340ebcda585b557c888122e73a485b90a79e7d72996c910d08c817e55f8dc852326ca3134f8b33630ea3 WHIRLPOOL 166501729284022798af4253c3568d6baf63f553bfce4878a7140141bbe17dadaff044dd69fe35a757add7ca166125e20ae0ab702dc237130d19ff4aa93fd5e9
DIST VirtualBoxSDK-4.1.18-78361.zip 8805499 SHA256 9c8a7461529d11252443305749a086584090fbd8ff106d6e62b6a76d0fe0443e SHA512 bc17d278de6d9b372874212ce89e3440f11b04e7892a807a0c6b909f24823ae292ce2c7c888924afa5e001d746d604722e4f5d16716a60328e24c76f6d81f794 WHIRLPOOL 8ace578dd0b97e8516f0786e93f4dc2f5fa5d86c404b38289e18351276f6727be326126275c1ea8e26874ebe4d4e847c9defdaa3658dd387e83960a768f2ff5f
-DIST VirtualBoxSDK-4.1.20-80170.zip 8806206 SHA256 83ff7449c91d3457fe3e877579b292705b592000e32e15bf828232c87edd0874 SHA512 e38f6d6ee7ff568ece13e08e9e1a7677dcea554512ab6f55cb985fb9e3e62238e9881f60bbd586a96833845daad934edb9c7d8d738df6f4d5c10598434367bbf WHIRLPOOL 281426569e97aed3b1eb7308253e80e34e50f7e9626783f956b31d3eed3e145c7024a7f90436efd5b62a269d69658fe6e69f2d77224f0472d231a15bb61d5f03
DIST VirtualBoxSDK-4.1.22-80657.zip 8805310 SHA256 89f221ae08863342e7a8da3186135796430614e5792d7f8eae284b1360f669d2 SHA512 e488f6099f814174555112bccb06710d1dd782943c01ae4afb6f907328f28b198caf992f6c142751223b71cff02cdaca206fddd5f61b00c4c010ed84f922f94d WHIRLPOOL 69d9c3c1e44e5657d88b1d6b6da0deb8b65d0f88656eea895249fb610bdc0c0539b0c6daadaf04185296fbc2553873acf86308d26725d3292760ff395bf3390d
+DIST VirtualBoxSDK-4.2.0-80737.zip 9718188 SHA256 cf1bca71340d78b474c5c74eadf97d66121b39a6fa575b156f2f1e1f8a8db24d SHA512 699d01933d65fde33ebd60f7b4928801641c5ae2432fee0693da84cffe3271012a09ed7021d71381bd6894d4457e90ed02fac14dcb8b58dea396dbf990344db5 WHIRLPOOL c407867a4b4d68844553c33d012b79bbd80f2cad59e94435c451486518aca1022480fa4d13b2fddc6e93231fe5d7b9cbe6d60be3d30166e5c33a856230b43206
View
18 ...rtualbox-bin/virtualbox-bin-4.1.20.ebuild → ...irtualbox-bin/virtualbox-bin-4.2.0.ebuild
@@ -1,23 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.20.ebuild,v 1.1 2012/08/21 08:58:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.0.ebuild,v 1.1 2012/09/13 19:39:53 polynomial-c Exp $
EAPI=2
inherit eutils unpacker fdo-mime gnome2 pax-utils
-MY_PV=${PV}-80170
-SDK_PV=${MY_PV}
+MY_PV=${PV/beta/BETA}
+MY_PV=${MY_PV/rc/RC}
+VBOX_PV=${MY_PV}-80737
+SDK_PV=${VBOX_PV}
EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
+MY_P=VirtualBox-${VBOX_PV}-Linux
EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
- x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
- sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
- http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+ x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+ sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )
+ http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
LICENSE="GPL-2 PUEL"
SLOT="0"
View
2 app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881 SHA512 8156fb23fcb5aead17da3f68d1303339e80981466c92531a1255b0f97aaa3c09243c6f6802220cac9abb1ab70255a51b8d3bed479d1724f4350d043cbec27fd7 WHIRLPOOL 3607b3dc4d3dd1947b41fd5859b796873441bdde228d138d31b11865e21c750cdf7a329f0b13778ecf63d4b0b176b38f0d72fe0057ce217e8299c7737af62983
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.18-78361.tar.gz 10572216 SHA256 1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198 SHA512 aeb7d04fd485fe55390e43e4b20cb87d64640c96beefc3f3bfdc755a2c3622dbbd006a9186731898f36b30ceed7ea887729d48c55874f28c0b6cd96c1cc2dbc0 WHIRLPOOL 513a78b062d75d4cd3a36ed4835a7878f9bf7b0b13d8981dd6664f71cef8f6503457e4dd909203c549a4068fa1608c4ab402944d4de1674a278da13a84da0859
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.20-80170.tar.gz 10749918 SHA256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a SHA512 828e3142e20c727ee058c0e56cabe53458437f6addf7de4586e0e513d8423e3fdbd479bd90aaa8498e4cf973506c637095506cc77c37bad11c7360ec3565638b WHIRLPOOL 8b2dfa67d2caff8ce5a057cb762b78d1b2c5bd1abb15f05f82ee323a92f7932ad53d09a162da2f2163c503e2a6b65ff4c6796501c10fc9f359aea185afe1a544
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.0-80737.tar.gz 10828566 SHA256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218 SHA512 ef637feea9041bcd68e5937a5bcc092b99862e2b9baa95263630f5ae2c1999c0cd2522b83707fb462d7a32af6ab1dcc2bf9275fd15ac94947cc5189b92c3b64e WHIRLPOOL b0696b319dff29a050ca5520e39625fb0d956e45309a2c773f1b77ad2fab83f9d7fbef4adb3a27be9ddd50068a45e4df155013cf7b6c879a9caa9e34ecf8a7aa
View
10 ...e/virtualbox-extpack-oracle-4.1.20.ebuild → ...le/virtualbox-extpack-oracle-4.2.0.ebuild
@@ -1,18 +1,20 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.20.ebuild,v 1.1 2012/08/21 09:18:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.0.ebuild,v 1.1 2012/09/13 19:42:35 polynomial-c Exp $
EAPI=2
inherit eutils multilib
-MY_BUILD="80170"
+MY_BUILD="80737"
MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}-${MY_BUILD}"
DESCRIPTION="PUEL extensions for VirtualBox"
HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
LICENSE="PUEL"
SLOT="0"
View
3 app-emulation/virtualbox-guest-additions/Manifest
@@ -1,3 +1,4 @@
DIST VirtualBox-4.1.12.tar.bz2 73250628 SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02 SHA512 93122eb428c114b73c76775d1643ea297dff3800b9c1950ad0e5ad2dbb3b308a119dd065364d2578035746f5844f813c881227b188c3965752ff31dad5017c5d WHIRLPOOL d8f4446a069b9a73ebc20bcf23d464e16adba40bd356adbba4f1fc1e1a0dca089b101bc7b4483e0c28b0c2b1bd88c0cd28dffa045f4f95303ca926825ce9a2e9
DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7 SHA512 8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e WHIRLPOOL 0e232225431b230fd73e8d23bcdb23e413aa85fc336aa8af179f190c2b855b77057daa324ef1fcc5da08a75c51daa87f04beb97f03bdbd9ce2a270064debca78
-DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
+DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
+DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 SHA512 76cddb682a2f5615e8ab465e8766d0ba19e1482b595a185cb401fdb962fb6f161945986ea5514934652305fa3d25f66a88767572fa4e0c5d3b5d5ffeb15c8005 WHIRLPOOL 5c4521a1dfc5b249c6c9692741a83014dc98496086e31186883e8b3f43c18af700f8002c3586b1475fd2c8bac2cbcaadc90aafb259ec50ebbeb3703440ddb822
View
2 .../virtualbox-guest-additions-4.1.20.ebuild → .../virtualbox-guest-additions-4.1.22.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/virtualbox-guest-additions/virtualbox-guest-additions-4.1.20.ebuild,v 1.1 2012/08/21 09:20:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.1 2012/09/13 19:46:22 polynomial-c Exp $
EAPI=2
View
201 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild,v 1.1 2012/09/13 19:46:22 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+ x11-apps/xrandr
+ x11-apps/xrefresh
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM
+ x11-libs/libICE )
+ !!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+ >=dev-util/kbuild-0.1.9998_pre20120806
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-devel/dev86
+ sys-libs/pam
+ sys-power/iasl
+ X? ( x11-proto/renderproto )
+ !X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+ vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+ enewgroup vboxguest
+ enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Create and unpack a tarball with the sources of the Linux guest
+ # kernel modules, to include all the needed files
+ "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+ unpack ./vbox-kmod.tar.gz
+
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ cd "${S}"
+ rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+ # PaX fixes (see bug #298988)
+ pushd "${WORKDIR}" &>/dev/null || die
+ epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+ popd &>/dev/null || die
+
+ # Disable things unused or splitted into separate ebuilds
+ cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+ # stupid new header references...
+ for vboxheader in {product,revision}-generated.h ; do
+ for mdir in vbox{guest,sf} ; do
+ ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+ "${WORKDIR}/${mdir}/${vboxheader}"
+ done
+ done
+}
+
+src_configure() {
+ # build the user-space tools, warnings are harmless
+ ./configure --nofatal \
+ --disable-xpcom \
+ --disable-sdl-ttf \
+ --disable-pulse \
+ --disable-alsa \
+ --build-headless || die "configure failed"
+}
+
+src_compile() {
+ source ./env.sh
+
+ for each in /src/VBox/{Runtime,Additions/common} \
+ /src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+ cd "${S}"${each}
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \
+ KBUILD_PATH="${S}/kBuild" \
+ || die "kmk VBoxControl failed"
+ done
+
+ if use X; then
+ cd "${S}"/src/VBox/Additions/x11/VBoxClient
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \
+ KBUILD_PATH="${S}/kBuild" \
+ || die "kmk VBoxClient failed"
+ fi
+
+ # Now creating the kernel modules. We must do this _after_
+ # we compiled the user-space tools as we need two of the
+ # automatically generated header files. (>=3.2.0)
+ linux-mod_src_compile
+}
+
+src_install() {
+ linux-mod_src_install
+
+ cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+ insinto /sbin
+ newins mount.vboxsf mount.vboxsf
+ fperms 4755 /sbin/mount.vboxsf
+
+ newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+ insinto /usr/sbin/
+ newins VBoxService vboxguest-service
+ fperms 0755 /usr/sbin/vboxguest-service
+
+ insinto /usr/bin
+ doins VBoxControl
+ fperms 0755 /usr/bin/VBoxControl
+
+ # VBoxClient user service and xrandr wrapper
+ if use X; then
+ doins VBoxClient
+ fperms 0755 /usr/bin/VBoxClient
+
+ cd "${S}"/src/VBox/Additions/x11/Installer
+ newins 98vboxadd-xclient VBoxClient-all
+ fperms 0755 /usr/bin/VBoxClient-all
+ fi
+
+ # udev rule for vboxdrv
+ dodir /lib/udev/rules.d
+ echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+ || die
+ echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+ || die
+
+ # VBoxClient autostart file
+ insinto /etc/xdg/autostart
+ doins "${FILESDIR}"/vboxclient.desktop
+
+ # sample xorg.conf
+ insinto /usr/share/doc/${PF}
+ doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ if ! use X ; then
+ elog "use flag X is off, enable it to install the"
+ elog "X Window System input and video drivers"
+ fi
+ elog ""
+ elog "Please add users to the \"vboxguest\" group so they can"
+ elog "benefit from seamless mode, auto-resize and clipboard."
+ elog ""
+ elog "Please add:"
+ elog "/etc/init.d/${PN}"
+ elog "to the default runlevel in order to start"
+ elog "needed services."
+ elog "To use the VirtualBox X drivers, use the following"
+ elog "file as your /etc/X11/xorg.conf:"
+ elog " /usr/share/doc/${PF}/xorg.conf.xorg"
+ elog ""
+ elog "Also make sure you use the Mesa library for OpenGL:"
+ elog " eselect opengl set xorg-x11"
+ elog ""
+ elog "An autostart .desktop file has been installed to start"
+ elog "VBoxClient in desktop sessions."
+ elog ""
+ elog "You can mount shared folders with:"
+ elog " mount -t vboxsf <shared_folder_name> <mount_point>"
+ elog ""
+ elog "Warning:"
+ elog "this ebuild is only needed if you are running gentoo"
+ elog "inside a VirtualBox Virtual Machine, you don't need"
+ elog "it to run VirtualBox itself."
+ elog ""
+}
View
2 app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
DIST vbox-kernel-module-src-4.1.12.tar.xz 459148 SHA256 70707451b9dab6128005410f515f0c2c5d8c295b319243d9e623ae68c5acff1f SHA512 a90a74ced4893b7e017a96c0bbd1c4023a5b7aef263baaca38006753c559359a473f291c947f738ea68357c4a83ec0cef2282900ca0c886b291a94376089bc7b WHIRLPOOL 0c42dbca42b86b604a59273dd1eeeb401942db1a5e2c990d9b2f5920fc7b353f53a997787ed08eae41d9a5e513e70d5c526a5ea4c11ecb65f25fb36500fe92bb
DIST vbox-kernel-module-src-4.1.18.tar.xz 459308 SHA256 e5fe22add223af149dba2061343573326f0aaf37d1b2959c24097005ff4037ef SHA512 f7676013a2a77d03d6c9b29e4444655f76c148819d204e792a29e14458a32d3c9b4474160502f830d7704b4733e44e46051adf279e8e8f04e863c3ff4bc24247 WHIRLPOOL 3751a03d8d556622dddf8bddef7e9f2ff12b9a518c93bfbd8493455c7de20447771e5559e51aae3af113c41fcc46cdf8c4555ff941484424fea5884c690eaad5
-DIST vbox-kernel-module-src-4.1.20.tar.xz 459736 SHA256 d7ab3c31c08b277bf223ae16338b0b0e7ad03208138193b622e9f9e37e35a7d2 SHA512 c0846f8016c7733f58fbd080695a9cc16260332c6c2943c067cf8870265cfdd17ebdc8270ed1928f9942672c8c84acd23c006a01ca3d8eb6d9ccba2967b27930 WHIRLPOOL faa1d8fd836e0f3abc94d7d5aa94b31c61cb16fb4ee747bffa10e444fe21904a11177e7215206df8820375a29e66e1ba3a5ddd4f721571606df0e65c04da49ec
DIST vbox-kernel-module-src-4.1.22.tar.xz 459980 SHA256 8d37d4c4497fd1de9511af2eb1aea4959045b47ad623f04e76958dfabd0848e3 SHA512 3ac0e55b794468b7b4b204500334d86763c523a2dfac84d830153b3ca324883fdce996eeaa35fa0e36606b46c126c0ab77374d1d3d7df8b65cf1058335ece214 WHIRLPOOL 19b2bfa3be78a845af962c80a5dd1defc7bbba2d30f0641ff02d069d5d2e3fab53eb4ce42a450ff16d5ea40f2ec3b5b88af8f341a481a93c6fe2aad03eca09ce
+DIST vbox-kernel-module-src-4.2.0.tar.xz 459752 SHA256 d259fd8023f1418c7e025d3bc795b4edacddb913135ef02c36249d498788b241 SHA512 a784d76756abea86c35ac1146c290926ccc93434b1b6850efa1338bc95dade291521a080e0c43f7858ff589da62559ed60a882015ed8140941d5eb0c9b54416c WHIRLPOOL 60e5b83cf57d80472af91a07e8608ea36b18ffccccfdcffe8bcc4750932b8117f33a3d40fd2a8dbc2bade22f2fcfdbb9a896bce017dbd919cfa951b57e485fb8
View
2 ...-modules/virtualbox-modules-4.1.20.ebuild → ...x-modules/virtualbox-modules-4.2.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-emulation/virtualbox-modules/virtualbox-modules-4.1.20.ebuild,v 1.1 2012/08/21 08:58:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild,v 1.1 2012/09/13 19:37:11 polynomial-c Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
View
2 app-emulation/virtualbox/Manifest
@@ -1,4 +1,4 @@
DIST VirtualBox-4.1.12.tar.bz2 73250628 SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02 SHA512 93122eb428c114b73c76775d1643ea297dff3800b9c1950ad0e5ad2dbb3b308a119dd065364d2578035746f5844f813c881227b188c3965752ff31dad5017c5d WHIRLPOOL d8f4446a069b9a73ebc20bcf23d464e16adba40bd356adbba4f1fc1e1a0dca089b101bc7b4483e0c28b0c2b1bd88c0cd28dffa045f4f95303ca926825ce9a2e9
DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7 SHA512 8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e WHIRLPOOL 0e232225431b230fd73e8d23bcdb23e413aa85fc336aa8af179f190c2b855b77057daa324ef1fcc5da08a75c51daa87f04beb97f03bdbd9ce2a270064debca78
-DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
+DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 SHA512 76cddb682a2f5615e8ab465e8766d0ba19e1482b595a185cb401fdb962fb6f161945986ea5514934652305fa3d25f66a88767572fa4e0c5d3b5d5ffeb15c8005 WHIRLPOOL 5c4521a1dfc5b249c6c9692741a83014dc98496086e31186883e8b3f43c18af700f8002c3586b1475fd2c8bac2cbcaadc90aafb259ec50ebbeb3703440ddb822
View
130 app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
@@ -0,0 +1,130 @@
+Index: Config.kmk
+===================================================================
+diff --git a/trunk/Config.kmk b/trunk/Config.kmk
+--- a/trunk/Config.kmk (revision 43316)
++++ b/trunk/Config.kmk (working copy)
+@@ -2230,6 +2230,7 @@ $(PATH_OUT)/GCCConfig.kmk: \
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-pointer-to-int-cast ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-to-int-cast,)'
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-variadic-macros ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)'
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
++ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_nopie ?= $(call VBOX_GCC_CHECK_CC,-nopie,)'
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'
+ # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
+@@ -2881,8 +2882,8 @@ ifdef VBOX_WITH_RAW_MODE
+
+ ifeq ($(VBOX_LDR_FMT32),elf)
+ TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
+- TEMPLATE_VBoxRc_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+- TEMPLATE_VBoxRc_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
++ TEMPLATE_VBoxRc_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
++ TEMPLATE_VBoxRc_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden)
+ ifeq ($(KBUILD_TARGET),solaris)
+ TEMPLATE_VBoxRc_LDFLAGS = -r
+ else
+@@ -2936,9 +2937,9 @@ ifdef VBOX_WITH_RAW_MODE
+ endif
+
+ ifeq ($(VBOX_LDR_FMT32),elf)
+- TEMPLATE_VBoxRcExe_CFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0
+- TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0
+- TEMPLATE_VBoxRcExe_LDFLAGS = -g
++ TEMPLATE_VBoxRcExe_CFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie)
++ TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie)
++ TEMPLATE_VBoxRcExe_LDFLAGS = -g $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
+ TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
+ TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
+@@ -3009,8 +3010,8 @@ endif # pe
+
+ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
+-TEMPLATE_VBoxR0_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
+-TEMPLATE_VBoxR0_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
++TEMPLATE_VBoxR0_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
++TEMPLATE_VBoxR0_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
+ TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
+ ifeq ($(KBUILD_TARGET),solaris)
+@@ -3039,12 +3040,12 @@ TEMPLATE_VBoxR0_TOOL = GXX4MACHO
+ TEMPLATE_VBoxR0_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxR0_CXXFLAGS = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
+ -fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+- -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++ -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.x86 = -m32
+ TEMPLATE_VBoxR0_CFLAGS = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \
+ -fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+- -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++ -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CFLAGS.x86 = -m32
+ TEMPLATE_VBoxR0_LDFLAGS = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
+@@ -3114,7 +3115,7 @@ TEMPLATE_VBOXR0DRV_DEFS += __KERNEL_
+ TEMPLATE_VBOXR0DRV_INCS = $(VBOX_LINUX_INCS)
+ TEMPLATE_VBOXR0DRV_CFLAGS = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
+ $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare $(VBOX_GCC_fdiagnostics-show-option) \
+- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -mpreferred-stack-boundary=2 -msoft-float
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+@@ -3242,7 +3243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
+ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
+ -Wimplicit-function-declaration -Werror-implicit-function-declaration \
+ -O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
+- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ -nostdinc -std=c99
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
+@@ -3251,7 +3252,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --pa
+ TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \
+ $(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+ -O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \
+- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ -nostdinc
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64 = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
+@@ -3827,8 +3828,8 @@ else
+ TEMPLATE_VBOXNOCRTGCC_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBOXNOCRTGCC_ASTOOL = $(VBOX_ASTOOL)
+ TEMPLATE_VBOXNOCRTGCC_ASFLAGS = $(VBOX_ASFLAGS)
+- TEMPLATE_VBOXNOCRTGCC_CFLAGS += $(VBOX_GCC_fno-stack-protector)
+- TEMPLATE_VBOXNOCRTGCC_CXXFLAGS += $(VBOX_GCC_fno-stack-protector)
++ TEMPLATE_VBOXNOCRTGCC_CFLAGS += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
++ TEMPLATE_VBOXNOCRTGCC_CXXFLAGS += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+ # in 64-bit mode we'll build a sys-module (VBoxREM2).
+ if1of ($(KBUILD_TARGET), darwin solaris)
+@@ -4643,7 +4644,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_ASTOOL = YASM
+ TEMPLATE_VBOXLNXHOSTR3EXE_ASFLAGS = $(VBOX_ASFLAGS)
+ TEMPLATE_VBOXLNXHOSTR3EXE_DLLSUFF = .so
+ TEMPLATE_VBOXLNXHOSTR3EXE_DEFS = IN_RING3 $(ARCH_BITS_DEFS)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug = -fno-inline
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
+@@ -4652,7 +4653,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.release = $(TE
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.debug = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.profile = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.kprofile = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_LIBS = pthread m rt dl
+
+ TEMPLATE_VBOXLNXHOSTR3LIB = Template for linux host libraries.
+@@ -4836,8 +4837,8 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux n
+ TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386
+ TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64
+ endif
+-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
+ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \
+ $(VBOX_LIB_VBGL_R3_XFREE86)
View
15 ...on/virtualbox/virtualbox-4.1.20-r1.ebuild → ...lation/virtualbox/virtualbox-4.2.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-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.3 2012/09/05 09:16:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0.ebuild,v 1.2 2012/09/14 04:16:41 polynomial-c Exp $
EAPI=4
@@ -11,8 +11,10 @@ if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
inherit linux-mod subversion
else
- MY_P=VirtualBox-${PV}
- SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+ MY_PV="${PV/beta/BETA}"
+ MY_PV="${MY_PV/rc/RC}"
+ MY_P=VirtualBox-${MY_PV}
+ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
fi
@@ -50,7 +52,7 @@ RDEPEND="!app-emulation/virtualbox-bin
vnc? ( >=net-libs/libvncserver-0.9.9 )
java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.999
+ >=dev-util/kbuild-0.1.9998_pre20120806
>=dev-lang/yasm-0.6.2
sys-devel/bin86
sys-devel/dev86
@@ -176,7 +178,7 @@ src_prepare() {
# Fix compile error on hardened bug 339914 (disable PIE)
if gcc-specs-pie ; then
- epatch "${FILESDIR}"/${PN}-4.1.20-nopie.patch
+ epatch "${FILESDIR}"/virtualbox-4.2.0-nopie.patch
fi
}
@@ -272,9 +274,6 @@ src_install() {
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
- # VBoxSVC needs to be pax-marked (bug #403453)
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
-
if ! use headless ; then
for each in VBox{SDL,Headless} ; do
doins $each || die
View
39 app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch
@@ -0,0 +1,39 @@
+https://www.midnight-commander.org/ticket/2881
+https://bugs.gentoo.org/show_bug.cgi?id=434688
+
+commit 28cd54da5a73e6d722bd0534e3f43baedb398cea
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date: Tue Sep 11 10:14:48 2012 +0400
+
+ Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
+
+ ...after tab character.
+
+ Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+
+diff --git a/src/editor/edit.c b/src/editor/edit.c
+index bfda1b9..3dfd22e 100644
+--- a/src/editor/edit.c
++++ b/src/editor/edit.c
+@@ -3073,16 +3073,15 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto)
+ c = convert_to_display_c (c);
+ #endif
+
++ if (c == '\n')
++ return (upto != 0 ? (off_t) col : p);
+ if (c == '\t')
+ col += TAB_SIZE - col % TAB_SIZE;
+- else if (c == '\n')
+- return (upto != 0 ? (off_t) col : p);
+-
+- if ((c < 32 || c == 127) && (orig_c == c
++ else if ((c < 32 || c == 127) && (orig_c == c
+ #ifdef HAVE_CHARSET
+- || (!mc_global.utf8_display && !edit->utf8)
++ || (!mc_global.utf8_display && !edit->utf8)
+ #endif
+- ))
++ ))
+ /* '\r' is shown as ^M, so we must advance 2 characters */
+ /* Caret notation for control characters */
+ col += 2;
View
4 app-misc/mc/mc-4.8.5.ebuild → app-misc/mc/mc-4.8.5-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/mc/mc-4.8.5.ebuild,v 1.1 2012/09/10 21:02:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.5-r1.ebuild,v 1.1 2012/09/14 05:12:42 slyfox Exp $
EAPI=4
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
src_prepare() {
[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+ epatch "${FILESDIR}"/${P}-Ticket-2881-fix-tabs.patch
}
S=${WORKDIR}/${MY_P}
View
11 app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
@@ -0,0 +1,11 @@
+--- configure.in.ori 2012-04-03 13:06:36.452630827 +0200
++++ configure.in 2012-04-03 13:07:19.139299726 +0200
+@@ -689,7 +689,7 @@
+ fi
+ fi
+
+-AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
++AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
+
+ dnl ======================== Check for libsocket
+ AC_CHECK_LIB(socket, socket)
View
4 app-office/calligra/calligra-2.5.2.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-office/calligra/calligra-2.5.2.ebuild,v 1.2 2012/09/13 13:37:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.2.ebuild,v 1.3 2012/09/13 19:36:29 scarabeus Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -189,7 +189,7 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_build mysql)
+ $(cmake-utils_use_build mysql mySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
View
4 app-office/calligra/calligra-2.5.49.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-office/calligra/calligra-2.5.49.9999.ebuild,v 1.1 2012/08/30 11:30:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild,v 1.2 2012/09/13 19:36:29 scarabeus Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -191,7 +191,7 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_build mysql)
+ $(cmake-utils_use_build mysql mySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
View
4 app-office/calligra/calligra-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-office/calligra/calligra-9999.ebuild,v 1.29 2012/08/30 11:30:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.30 2012/09/13 19:36:29 scarabeus Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -189,7 +189,7 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_build mysql)
+ $(cmake-utils_use_build mysql mySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
View
1 dev-cpp/tbb/Manifest
@@ -1 +1,2 @@
DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
+DIST tbb41_20120718oss_src.tgz 2223581 SHA256 fb5c2082b6871eedc6c77ac7cec7d46f5ce7498b848f91808d954d93469115cb SHA512 3e7b2367db84c4c46dd2f7ecb1ac35068bd8ef8adf768ec11a5b37306c9e100e02d685c877521fbcc4928d612e7b2663574ba439f938011e6a0477de750d417a WHIRLPOOL 9b323f881d72940ae17ab42e6e8051dc2ecf704bce8d3da5ec4cb111bf432323232a1dacc62e4381977ac773bb14502f01261c8fcaff9aad465c296df6ab5595
View
231 dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
@@ -0,0 +1,231 @@
+From: Sebastien Fabbro <bicatali@gentoo.org>
+Date: Thu Sep 13 15:13:19 PDT 2012
+Subject: build system
+
+respect LDFLAGS properly
+wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
+
+diff -Nur tbb41_20120718oss.orig/build/common_rules.inc tbb41_20120718oss/build/common_rules.inc
+--- tbb41_20120718oss.orig/build/common_rules.inc 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/common_rules.inc 2012-09-13 14:58:45.556908494 -0700
+@@ -44,8 +44,6 @@
+ ifeq ($(tbb_cpf),1)
+ CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
+ endif
+-LINK_FLAGS += $(LDFLAGS)
+-LIB_LINK_FLAGS += $(LDFLAGS)
+ CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
+
+ LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
+diff -Nur tbb41_20120718oss.orig/build/Makefile.rml tbb41_20120718oss/build/Makefile.rml
+--- tbb41_20120718oss.orig/build/Makefile.rml 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/Makefile.rml 2012-09-13 14:58:45.556908494 -0700
+@@ -103,7 +103,7 @@
+
+ $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
+ $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
+- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
++ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+
+ ifneq (,$(RML_NO_VERSION.DLL))
+ $(RML_NO_VERSION.DLL):
+@@ -126,13 +126,13 @@
+ RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
+
+ test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+
+ test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+
+ test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+
+ rml_omp_stub.$(OBJ): rml_omp_stub.cpp
+ $(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
+@@ -141,7 +141,7 @@
+ $(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
+
+ test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+
+ ### run_cmd is usually empty
+ rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbb tbb41_20120718oss/build/Makefile.tbb
+--- tbb41_20120718oss.orig/build/Makefile.tbb 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/Makefile.tbb 2012-09-13 14:58:45.556908494 -0700
+@@ -120,7 +120,7 @@
+
+ $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
+ $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
+- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
++ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+
+ ifneq (,$(TBB_NO_VERSION.DLL))
+ $(TBB_NO_VERSION.DLL):
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbmalloc tbb41_20120718oss/build/Makefile.tbbmalloc
+--- tbb41_20120718oss.orig/build/Makefile.tbbmalloc 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/Makefile.tbbmalloc 2012-09-13 15:06:11.893254873 -0700
+@@ -82,7 +82,7 @@
+
+ $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
+ $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
+- $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
++ $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+
+ ifneq (,$(MALLOCPROXY.DEF))
+ tbbmallocproxy.def: $(MALLOCPROXY.DEF)
+@@ -95,7 +95,7 @@
+ ifneq (,$(MALLOCPROXY.DLL))
+ $(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
+ $(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
+- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
++ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+ endif
+
+ ifneq (,$(MALLOC_NO_VERSION.DLL))
+@@ -143,38 +143,38 @@
+ endif
+
+ test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
+- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+
+ test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
+- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+
+ test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
+
+ # TODO: use generic rules
+ test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
+
+ test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
+
+ $(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+
+ MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
+
+ $(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
+
+ # Rules for generating a test DLL
+ %_dll.$(DLL): %_dll.$(OBJ)
+- $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
++ $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ .PRECIOUS: %_dll.$(OBJ)
+
+ test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+
+ MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
+ ifneq (,$(MALLOCPROXY.DLL))
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbproxy tbb41_20120718oss/build/Makefile.tbbproxy
+--- tbb41_20120718oss.orig/build/Makefile.tbbproxy 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/Makefile.tbbproxy 2012-09-13 14:58:45.557908491 -0700
+@@ -102,7 +102,7 @@
+
+ # Link rules.
+ $(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+
+ # Compilation rules.
+ $(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
+diff -Nur tbb41_20120718oss.orig/build/Makefile.test tbb41_20120718oss/build/Makefile.test
+--- tbb41_20120718oss.orig/build/Makefile.test 2012-08-06 05:06:15.000000000 -0700
++++ tbb41_20120718oss/build/Makefile.test 2012-09-13 15:10:46.438703091 -0700
+@@ -55,17 +55,17 @@
+
+ # Rule for generating executable test
+ %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+
+ # Rules for generating a test DLL
+ %_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
+
+ # Rules for the tests, which use TBB in a dynamically loadable library
+ test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
+ test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+
+
+ # tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
+@@ -82,31 +82,31 @@
+ $(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
+
+ $(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+
+ # Tests that use some features of C++11
+ TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
+
+ $(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
+- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
++ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
+ $(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+
+ test_tbb_header2.$(OBJ): test_tbb_header.cpp
+- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
++ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
+
+ # Detecting "multiple definition" linker error using the test that covers the whole library
+ test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+
+ # Checks that TBB atomics work correctly in position independent code
+ test_atomic_pic.$(TEST_EXT): test_atomic.cpp
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+
+ #Test of generic gcc port
+ %_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_GCC_BUILTINS=1
+ %_compiler_builtins.$(TEST_EXT): %.cpp
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+
+ # The main list of TBB tests
+ TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT) \
+@@ -192,7 +192,7 @@
+
+ ifdef OPENMP_FLAG
+ test_openmp.$(TEST_EXT): test_openmp.cpp
+- $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
++ $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+ test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
+ $(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
+ else
+@@ -202,7 +202,7 @@
+
+ ifdef CILK_AVAILABLE
+ test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
+- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
++ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ # Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
+ # The issue reveals itself if a version of binutils is prior to 2.17
+ ifeq (linux_icc,$(tbb_os)_$(compiler))
View
6 dev-cpp/tbb/tbb-4.0.297.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/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.10 2012/08/08 12:04:53 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.11 2012/09/13 22:37:22 bicatali Exp $
EAPI=4
inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -22,12 +22,12 @@ SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MY
LICENSE="GPL-2-with-exceptions"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples"
# FIXME
# https://bugs.gentoo.org/show_bug.cgi?id=412675#c10
# restricting test for stabilization
-RESTRICT="test"
+#RESTRICT="test"
DEPEND=""
RDEPEND="${DEPEND}"
View
120 dev-cpp/tbb/tbb-4.1.20120718.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20120718.ebuild,v 1.1 2012/09/13 22:37:22 bicatali Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="77/188"
+# release update
+MYR=""
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+# FIXME
+# https://bugs.gentoo.org/show_bug.cgi?id=412675#c10
+# sep 12: still many tests are failing
+# restricting test for stabilization
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-4.1.20120718-ldflags.patch \
+ "${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+ # use fully qualified compilers. do not force pentium4 for x86 users
+ sed -i \
+ -e "s/-O2/${CXXFLAGS}/g" \
+ -e "/CPLUS/s/g++/$(tc-getCXX)/g" \
+ -e "/CONLY/s/gcc/$(tc-getCC)/g" \
+ -e "s/shell gcc/shell $(tc-getCC)/g" \
+ -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+ -e 's/-m64//g' \
+ -e 's/-m32//g' \
+ build/*.inc || die
+ # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+ # actual command.
+ # - Force generation of version_string.tmp immediately after the directory
+ # is created. This avoids a race when the user builds tbb and tbbmalloc
+ # concurrently. The choice of Makefile.tbb (instead of
+ # Makefile.tbbmalloc) is arbitrary.
+ #sed -i \
+ # -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+ # -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+ # src/Makefile || die
+ find include -name \*.html -delete
+
+ cat <<-EOF > ${PN}.pc
+ prefix=${EPREFIX}/usr
+ libdir=\${prefix}/$(get_libdir)
+ includedir=\${prefix}/include
+ Name: ${PN}
+ Description: ${DESCRIPTION}
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -ltbb -ltbbmalloc
+ Cflags: -I\${includedir}
+ EOF
+}
+
+src_compile() {
+ # wrt #418453#c3
+ append-ldflags $(no-as-needed)
+
+ if [[ $(tc-getCXX) == *g++ ]]; then
+ myconf="compiler=gcc"
+ elif [[ $(tc-getCXX) == *ic*c ]]; then
+ myconf="compiler=icc"
+ fi
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+ fi
+ emake -C src ${ccconf} tbb_release tbbmalloc_release
+}
+
+src_test() {
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+ fi
+ emake -j1 -C src ${ccconf} test_release
+}
+
+src_install(){
+ local l
+ for l in $(find build -name lib\*.so.\*); do
+ dolib.so ${l}
+ local bl=$(basename ${l})
+ dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+ done
+ insinto /usr
+ doins -r include
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+ dodoc README CHANGES doc/Release_Notes.txt
+ use doc && dohtml -r doc/html/*
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples/build
+ doins build/*.inc
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples
+ fi
+}
View
1 dev-db/libdbi-drivers/Manifest
@@ -1,2 +1 @@
-DIST libdbi-drivers-0.8.1.tar.gz 1147446 SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd SHA512 90f9909f87a540fbd317812a3fa1f121c42544d56ced838c72c5668122ebb070408aeb57fb5394766dd15ee4ff2309c73df5a837370f12af5750aa27721051f2 WHIRLPOOL 11dcac53d0f337eaec579575cbfa9ea7547834b893428dcd62889285d9df00cdba3fbc0c117872129c317d9ef9152519f75cc2c2df4c9ebf8e5e7535ab198269
DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700
View
20 dev-db/libdbi-drivers/files/libdbi-drivers-0.8.1-oci8.diff
@@ -1,20 +0,0 @@
---- libdbi-drivers-0.8.1/drivers/oracle/dbd_oracle.c.orig 2005-08-31 23:44:53.000000000 +0200
-+++ libdbi-drivers-0.8.1/drivers/oracle/dbd_oracle.c 2006-05-30 13:10:48.000000000 +0200
-@@ -523,7 +523,7 @@
- unsigned int sizeattrib;
- dbi_data_t *data;
- char *ptr, *cols[result->numfields];
-- dword status;
-+ sword status;
-
- /*
- * Prefetch all cols as char *'s
-@@ -700,7 +700,7 @@
- }
-
- /* taken from sqlite3 driver */
--size_t dbd_quote_binary (dbi_conn_t *conn, const unsigned char *orig, size_t from_length, char **ptr_dest ) {
-+size_t dbd_quote_binary (dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest ) {
- unsigned char *temp;
- size_t len;
-
View
65 dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild,v 1.13 2010/09/28 17:22:52 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.0
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( <dev-db/sqlite-3 )
- sqlite3? ( >=dev-db/sqlite-3 )
- firebird? ( dev-db/firebird )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
-SLOT=0
-
-src_unpack() {
- unpack ${A}
- EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-oci8.diff
-}
-
-src_compile() {
- local myconf=""
- local drivers=""
-# WARNING: the configure script does NOT work correctly
-# --without-$driver does NOT work
-# so do NOT use `use_with...`
- use mysql && drivers="${drivers} mysql" myconf="${myconf} --with-mysql"
- use postgres && drivers="${drivers} pgsql" myconf="${myconf} --with-pgsql"
- use sqlite && drivers="${drivers} sqlite" myconf="${myconf} --with-sqlite"
- use sqlite3 && drivers="${drivers} sqlite3" myconf="${myconf} --with-sqlite3"
- use firebird && drivers="${drivers} firebird" myconf="${myconf} --with-firebird"
- if use oci8; then
- if [ -z "${ORACLE_HOME}" ]; then
- die "\$ORACLE_HOME is not set!"
- fi
- myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle" drivers="${drivers} oracle"
- fi
-# safety check
- if [ -z "${drivers}" ]; then
- die "You have not specified any supported databases in your use flags (mysql, pgsql, sqlite, sqlite3, oracle, firebird)"
- fi
-
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install () {
- emake install DESTDIR="${D}" || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-src_test() {
- if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
- ewarn "Tests disabled due to interactivity."
- ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
- return 0
- fi
- einfo "Running interactive tests"
- emake check || die "Tests failed"
-}
View
86 dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild,v 1.9 2010/09/28 17:22:52 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.0
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( <dev-db/sqlite-3 )
- sqlite3? ( >=dev-db/sqlite-3 )
- !bindist? ( firebird? ( dev-db/firebird ) )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist"
-KEYWORDS="amd64 hppa ppc sparc x86"
-SLOT=0
-
-src_unpack() {
- unpack ${A}
- EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-oci8.diff
-}
-
-pkg_setup() {
- local drivers=""
- use mysql && drivers="${drivers} mysql"
- use postgres && drivers="${drivers} pgsql"
- use sqlite && driver