Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: bb0fc2399e939256e252cc22a050af44d0eaff15
  foo-overlay: 3151d1bc3adb6adb4f8004533d11c5264a43eb0b
  bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
  flora: da07848913dd5f3d08d4b662120c643fe83796bd
  mate: acb41977c759ef73d012ed0da8ba0018182587b3
  bliss: 7644195be264589d9b19f919befcf21edc88ecbb
  sabayon-for-gentoo: 90ba170fdd17ca621657aaf5ae99f898fc9b6d2f
  • Loading branch information...
1 parent 9da568b commit de91872b5cbbd425cbbf77426bda6b5c33fdc076 @danielrobbins danielrobbins committed Aug 5, 2013
Showing with 1,803 additions and 981 deletions.
  1. +77 −0 app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
  2. +77 −0 app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
  3. +48 −0 app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fortify.patch
  4. +2 −2 app-emulation/wine/wine-1.2.3.ebuild
  5. +2 −2 app-emulation/wine/wine-1.3.28.ebuild
  6. +2 −2 app-emulation/wine/wine-1.4.1.ebuild
  7. +2 −2 app-emulation/wine/wine-1.4.ebuild
  8. +2 −2 app-emulation/wine/wine-1.5.0.ebuild
  9. +2 −2 app-emulation/wine/wine-1.5.1.ebuild
  10. +2 −2 app-emulation/wine/wine-1.5.10-r1.ebuild
  11. +2 −2 app-emulation/wine/wine-1.5.11-r1.ebuild
  12. +2 −2 app-emulation/wine/wine-1.5.12-r1.ebuild
  13. +2 −2 app-emulation/wine/wine-1.5.13-r1.ebuild
  14. +2 −2 app-emulation/wine/wine-1.5.14-r1.ebuild
  15. +2 −2 app-emulation/wine/wine-1.5.15-r2.ebuild
  16. +2 −2 app-emulation/wine/wine-1.5.16-r1.ebuild
  17. +2 −2 app-emulation/wine/wine-1.5.17.ebuild
  18. +2 −2 app-emulation/wine/wine-1.5.18.ebuild
  19. +2 −2 app-emulation/wine/wine-1.5.19.ebuild
  20. +2 −2 app-emulation/wine/wine-1.5.2.ebuild
  21. +2 −2 app-emulation/wine/wine-1.5.20.ebuild
  22. +2 −2 app-emulation/wine/wine-1.5.21.ebuild
  23. +2 −2 app-emulation/wine/wine-1.5.22.ebuild
  24. +2 −2 app-emulation/wine/wine-1.5.23-r1.ebuild
  25. +2 −2 app-emulation/wine/wine-1.5.24.ebuild
  26. +2 −2 app-emulation/wine/wine-1.5.25.ebuild
  27. +2 −2 app-emulation/wine/wine-1.5.26.ebuild
  28. +2 −2 app-emulation/wine/wine-1.5.27.ebuild
  29. +2 −2 app-emulation/wine/wine-1.5.28.ebuild
  30. +2 −2 app-emulation/wine/wine-1.5.29.ebuild
  31. +2 −2 app-emulation/wine/wine-1.5.3.ebuild
  32. +2 −2 app-emulation/wine/wine-1.5.30.ebuild
  33. +2 −2 app-emulation/wine/wine-1.5.31.ebuild
  34. +2 −2 app-emulation/wine/wine-1.5.4.ebuild
  35. +2 −2 app-emulation/wine/wine-1.5.5.ebuild
  36. +2 −2 app-emulation/wine/wine-1.5.6.ebuild
  37. +2 −2 app-emulation/wine/wine-1.5.7.ebuild
  38. +2 −2 app-emulation/wine/wine-1.5.8.ebuild
  39. +2 −2 app-emulation/wine/wine-1.5.9.ebuild
  40. +2 −2 app-emulation/wine/wine-1.6.ebuild
  41. +2 −2 app-emulation/wine/wine-1.7.0.ebuild
  42. +2 −2 app-emulation/wine/wine-9999.ebuild
  43. +2 −1 app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild
  44. +3 −3 app-portage/gentoopm/gentoopm-0.2.8.ebuild
  45. +3 −3 app-portage/gentoopm/gentoopm-9999.ebuild
  46. 0 app-portage/gpyutils/Manifest
  47. +29 −0 app-portage/gpyutils/gpyutils-9999.ebuild
  48. +15 −0 app-portage/gpyutils/metadata.xml
  49. +2 −2 app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
  50. +1 −0 app-shells/mksh/Manifest
  51. +38 −0 app-shells/mksh/mksh-47.ebuild
  52. +4 −4 app-text/podofo/podofo-0.9.2.ebuild
  53. +1 −0 dev-libs/libcli/Manifest
  54. +24 −0 dev-libs/libcli/files/libcli-1.9.7-libdir.patch
  55. +38 −0 dev-libs/libcli/libcli-1.9.7.ebuild
  56. +3 −3 dev-libs/libcli/metadata.xml
  57. +141 −0 dev-libs/libusbx/files/libusbx-1.0.16-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
  58. +103 −0 dev-libs/libusbx/files/libusbx-1.0.16-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
  59. +64 −0 dev-libs/libusbx/libusbx-1.0.16-r2.ebuild
  60. +1 −0 dev-python/python-linux-procfs/Manifest
  61. +8 −0 dev-python/python-linux-procfs/metadata.xml
  62. +21 −0 dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
  63. +21 −0 dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
  64. +0 −25 dev-ruby/quixml/quixml-0.2.1-r1.ebuild
  65. +1 −0 dev-ruby/rake-compiler/Manifest
  66. +48 −0 dev-ruby/rake-compiler/rake-compiler-0.9.1.ebuild
  67. +0 −23 dev-ruby/ruby-eb/ruby-eb-2.6.ebuild
  68. +0 −32 dev-ruby/rubytorrent/rubytorrent-0.3.ebuild
  69. +2 −2 media-gfx/rawstudio/rawstudio-2.0-r1.ebuild
  70. +2 −2 media-gfx/simple-scan/simple-scan-3.6.0.ebuild
  71. +21 −23 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
  72. +2 −2 media-libs/libv4l/libv4l-0.9.5-r1.ebuild
  73. +2 −2 media-libs/libv4l/libv4l-0.9.5.ebuild
  74. +2 −2 media-libs/libwebp/libwebp-0.3.1.ebuild
  75. +2 −2 media-libs/tiff/tiff-4.0.3-r2.ebuild
  76. +3 −2 media-sound/clementine/clementine-1.0.1-r1.ebuild
  77. +3 −2 media-sound/clementine/clementine-1.1.1.ebuild
  78. +1 −1 metadata/dtd/timestamp.chk
  79. +1 −1 metadata/glsa/timestamp.chk
  80. +5 −1 metadata/herds.xml
  81. +13 −0 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r2
  82. +13 −0 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
  83. +3 −3 metadata/md5-cache/app-emulation/wine-1.2.3
  84. +3 −3 metadata/md5-cache/app-emulation/wine-1.3.28
  85. +3 −3 metadata/md5-cache/app-emulation/wine-1.4
  86. +3 −3 metadata/md5-cache/app-emulation/wine-1.4.1
  87. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.0
  88. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.1
  89. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.10-r1
  90. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.11-r1
  91. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.12-r1
  92. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.13-r1
  93. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.14-r1
  94. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.15-r2
  95. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.16-r1
  96. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.17
  97. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.18
  98. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.19
  99. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.2
  100. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.20
  101. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.21
  102. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.22
  103. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.23-r1
  104. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.24
  105. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.25
  106. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.26
  107. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.27
  108. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.28
  109. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.29
  110. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.3
  111. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.30
  112. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.31
  113. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.4
  114. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.5
  115. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.6
  116. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.7
  117. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.8
  118. +3 −3 metadata/md5-cache/app-emulation/wine-1.5.9
  119. +3 −3 metadata/md5-cache/app-emulation/wine-1.6
  120. +3 −3 metadata/md5-cache/app-emulation/wine-1.7.0
  121. +3 −3 metadata/md5-cache/app-emulation/wine-9999
  122. +2 −2 metadata/md5-cache/app-office/libreoffice-bin-4.0.4.2
  123. +5 −5 metadata/md5-cache/app-portage/gentoopm-0.2.8
  124. +5 −5 metadata/md5-cache/app-portage/gentoopm-9999
  125. +12 −0 metadata/md5-cache/app-portage/gpyutils-9999
  126. +5 −5 metadata/md5-cache/app-portage/smart-live-rebuild-1.3
  127. +12 −0 metadata/md5-cache/app-shells/mksh-47
  128. +3 −3 metadata/md5-cache/app-text/podofo-0.9.2
  129. +10 −0 metadata/md5-cache/dev-libs/libcli-1.9.7
  130. +13 −0 metadata/md5-cache/dev-libs/libusbx-1.0.16-r2
  131. +14 −0 metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
  132. +12 −0 metadata/md5-cache/dev-python/python-linux-procfs-9999
  133. +0 −11 metadata/md5-cache/dev-ruby/quixml-0.2.1-r1
  134. +14 −0 metadata/md5-cache/dev-ruby/rake-compiler-0.9.1
  135. +0 −11 metadata/md5-cache/dev-ruby/ruby-eb-2.6
  136. +0 −11 metadata/md5-cache/dev-ruby/rubytorrent-0.3
  137. +3 −3 metadata/md5-cache/media-gfx/rawstudio-2.0-r1
  138. +3 −3 metadata/md5-cache/media-gfx/simple-scan-3.6.0
  139. +1 −1 metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r2
  140. +3 −3 metadata/md5-cache/media-libs/libv4l-0.9.5
  141. +3 −3 metadata/md5-cache/media-libs/libv4l-0.9.5-r1
  142. +3 −3 metadata/md5-cache/media-libs/libwebp-0.3.1
  143. +3 −3 metadata/md5-cache/media-libs/tiff-4.0.3-r2
  144. +3 −3 metadata/md5-cache/media-sound/clementine-1.0.1-r1
  145. +3 −3 metadata/md5-cache/media-sound/clementine-1.1.1
  146. +12 −0 metadata/md5-cache/net-analyzer/netsniff-ng-0.5.8_rc2
  147. +4 −5 metadata/md5-cache/net-analyzer/netsniff-ng-9999
  148. +0 −12 metadata/md5-cache/net-ftp/qshare-2.1.5
  149. +3 −3 metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
  150. +3 −3 metadata/md5-cache/net-libs/webkit-gtk-2.0.3
  151. +3 −3 metadata/md5-cache/net-libs/webkit-gtk-2.0.4
  152. +10 −0 metadata/md5-cache/net-misc/batctl-2013.3.0
  153. +13 −0 metadata/md5-cache/net-misc/batman-adv-2013.3.0
  154. +14 −0 metadata/md5-cache/net-misc/x2goserver-4.0.1.6
  155. +2 −2 metadata/md5-cache/net-p2p/pybitmessage-9999
  156. +3 −3 metadata/md5-cache/net-p2p/transmission-2.77-r1
  157. +3 −3 metadata/md5-cache/net-p2p/transmission-2.81
  158. +11 −0 metadata/md5-cache/net-print/foomatic-db-4.0.20130805
  159. +10 −0 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20130805
  160. +0 −11 metadata/md5-cache/rox-base/mime-editor-0.5-r2
  161. +14 −0 metadata/md5-cache/sci-astronomy/stellarium-0.12.2
  162. +14 −0 metadata/md5-cache/sci-libs/deap-1.0.0_rc2
  163. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.0.84
  164. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.0.85
  165. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.0.86
  166. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.10.0
  167. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.10.1
  168. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.10.2
  169. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.4.51
  170. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.4.52
  171. +0 −15 metadata/md5-cache/sys-kernel/gentoo-sources-3.4.53
  172. +3 −3 metadata/md5-cache/x11-libs/gdk-pixbuf-2.26.5
  173. +3 −3 metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.1
  174. +3 −3 metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.2
  175. +3 −3 metadata/md5-cache/xfce-extra/tumbler-0.1.29
  176. +1 −1 metadata/news/timestamp.chk
  177. +1 −1 metadata/timestamp
  178. +1 −1 metadata/timestamp.chk
  179. +1 −1 metadata/timestamp.x
  180. +1 −0 net-analyzer/netsniff-ng/Manifest
  181. +12 −0 net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-fortify_source.patch
  182. +11 −0 net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-libcli-test.patch
  183. +0 −4 net-analyzer/netsniff-ng/metadata.xml
  184. +62 −0 net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild
  185. +24 −20 net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
  186. +0 −24 net-ftp/qshare/qshare-2.1.5.ebuild
  187. +2 −2 net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
  188. +2 −2 net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
  189. +2 −2 net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
  190. +1 −0 net-misc/batctl/Manifest
  191. +36 −0 net-misc/batctl/batctl-2013.3.0.ebuild
  192. +1 −0 net-misc/batman-adv/Manifest
  193. +38 −0 net-misc/batman-adv/batman-adv-2013.3.0.ebuild
  194. +1 −1 net-misc/htpdate/Manifest
  195. +6 −3 net-misc/htpdate/metadata.xml
  196. +1 −0 net-misc/x2goserver/Manifest
  197. +70 −0 net-misc/x2goserver/x2goserver-4.0.1.6.ebuild
  198. +2 −2 net-p2p/pybitmessage/pybitmessage-9999.ebuild
  199. +3 −2 net-p2p/transmission/transmission-2.77-r1.ebuild
  200. +3 −2 net-p2p/transmission/transmission-2.81.ebuild
  201. +1 −0 net-print/foomatic-db-ppds/Manifest
  202. +29 −0 net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20130805.ebuild
  203. +1 −0 net-print/foomatic-db/Manifest
  204. +41 −0 net-print/foomatic-db/foomatic-db-4.0.20130805.ebuild
  205. +2 −1 profiles/desc/python_single_target.desc
  206. +2 −1 profiles/desc/python_targets.desc
  207. +1 −2 profiles/use.local.desc
  208. +0 −1 rox-base/mime-editor/Manifest
  209. +0 −18 rox-base/mime-editor/mime-editor-0.5-r2.ebuild
  210. +1 −0 sci-astronomy/stellarium/Manifest
  211. +1 −0 sci-astronomy/stellarium/metadata.xml
  212. +106 −0 sci-astronomy/stellarium/stellarium-0.12.2.ebuild
  213. +1 −0 sci-libs/deap/Manifest
  214. +24 −0 sci-libs/deap/deap-1.0.0_rc2.ebuild
  215. +0 −18 sys-kernel/gentoo-sources/Manifest
  216. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.0.84.ebuild
  217. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.0.85.ebuild
  218. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.0.86.ebuild
  219. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.10.0.ebuild
  220. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.10.1.ebuild
  221. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.10.2.ebuild
  222. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.4.51.ebuild
  223. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.4.52.ebuild
  224. +0 −29 sys-kernel/gentoo-sources/gentoo-sources-3.4.53.ebuild
  225. +2 −2 x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
  226. +2 −2 x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild
  227. +2 −2 x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
  228. +2 −2 xfce-extra/tumbler/tumbler-0.1.29.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild,v 1.3 2013/08/05 10:24:20 slyfox Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic pax-utils
+
+P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+ http://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
+
+RDEPEND="X? ( x11-libs/libX11
+ x11-libs/libXxf86vm
+ x11-libs/libXau
+ x11-libs/libXext
+ x11-libs/libXdmcp
+ x11-apps/xset
+ x11-apps/xlsfonts
+ x11-apps/bdftopcf
+ x11-apps/mkfontdir )
+ svga? ( media-libs/svgalib )
+ gpm? ( sys-libs/gpm )
+ alsa? ( media-libs/alsa-lib )
+ sndfile? ( media-libs/libsndfile )
+ fluidsynth? ( media-sound/fluidsynth
+ media-sound/fluid-soundfont )
+ media-libs/libsdl
+ >=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xf86dgaproto )
+ >=sys-devel/autoconf-2.57"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fortify.patch
+
+ # Has problems with -O3 on some systems
+ replace-flags -O[3-9] -O2
+
+ # This one is from media-sound/fluid-soundfont (bug #479534)
+ sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
+ -i src/plugin/fluidsynth/mid_o_flus.c || die
+}
+
+src_configure() {
+ econf $(use_with X x) \
+ $(use_with svga svgalib) \
+ $(use_enable debug) \
+ $(use_with gpm) \
+ $(use_with alsa) \
+ $(use_with sndfile) \
+ $(use_with fluidsynth) \
+ --with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
+ --sysconfdir="${EPREFIX}"/etc/dosemu/ \
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+ default
+
+ # r - randmmap: dosemu tries to get address mapping
+ # exactly where asked, loops otherwise.
+ # m - allow RWX mapping: as it's an emulator / code loader
+ pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild,v 1.1 2013/08/05 10:24:20 slyfox Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic pax-utils
+
+P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+ http://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
+
+RDEPEND="X? ( x11-libs/libX11
+ x11-libs/libXxf86vm
+ x11-libs/libXau
+ x11-libs/libXext
+ x11-libs/libXdmcp
+ x11-apps/xset
+ x11-apps/xlsfonts
+ x11-apps/bdftopcf
+ x11-apps/mkfontdir )
+ svga? ( media-libs/svgalib )
+ gpm? ( sys-libs/gpm )
+ alsa? ( media-libs/alsa-lib )
+ sndfile? ( media-libs/libsndfile )
+ fluidsynth? ( media-sound/fluidsynth
+ media-sound/fluid-soundfont )
+ media-libs/libsdl
+ >=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xf86dgaproto )
+ >=sys-devel/autoconf-2.57"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fortify.patch
+
+ # Has problems with -O3 on some systems
+ replace-flags -O[3-9] -O2
+
+ # This one is from media-sound/fluid-soundfont (bug #479534)
+ sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
+ -i src/plugin/fluidsynth/mid_o_flus.c || die
+}
+
+src_configure() {
+ econf $(use_with X x) \
+ $(use_with svga svgalib) \
+ $(use_enable debug) \
+ $(use_with gpm) \
+ $(use_with alsa) \
+ $(use_with sndfile) \
+ $(use_with fluidsynth) \
+ --with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
+ --sysconfdir="${EPREFIX}"/etc/dosemu/ \
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+ default
+
+ # r - randmmap: dosemu tries to get address mapping
+ # exactly where asked, loops otherwise.
+ # m - allow RWX mapping: as it's an emulator / code loader
+ pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}
@@ -0,0 +1,48 @@
+From ff9bea065f4cc6068dcb8d6ea9423105305ca590 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 5 Aug 2013 13:03:21 +0300
+Subject: [PATCH] src/tools/tools86.c: fix stack buffer overflow in
+ 'change_aout'
+
+Detected by gcc:
+
+gcc -std=gnu99 -c -MP -MMD -I../../src/include -I../../src/plugin/include -Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -pipe -O2 -fomit-frame-pointer -o tools86.o tools86.c
+In file included from /usr/include/stdio.h:937:0,
+ from tools86.c:98:
+ In function 'fread',
+ inlined from 'change_aout.constprop.1' at tools86.c:174:12,
+ inlined from 'main' at tools86.c:391:18:
+ /usr/include/bits/stdio2.h:293:2: warning: call to '__fread_chk_warn' declared with attribute warning: fread called with bigger size * nmemb than length of destination buffer [enabled by default]
+ return __fread_chk_warn (__ptr, __bos0 (__ptr), __size, __n, __stream);
+ ^
+Gentoo-bug: http://bugs.gentoo.org/343577
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/tools/tools86.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/tools86.c b/src/tools/tools86.c
+index 141610d..35a0b96 100644
+--- a/src/tools/tools86.c
++++ b/src/tools/tools86.c
+@@ -137,7 +137,7 @@ struct bsd_header { /* a.out header */
+ #endif
+
+ #ifdef __linux__
+-static int header_ld86out_to_gnuasout(struct bsd_header *bsd, struct gnu_header *gnu)
++static int header_ld86out_to_gnuasout(const struct bsd_header *bsd, struct gnu_header *gnu)
+ {
+ if (bsd->a_magic[0] != 0x01 || bsd->a_magic[1] != 0x03 ||
+ bsd->a_flags != 0x00 || bsd->a_cpu != 0x10) return -1;
+@@ -171,7 +171,7 @@ static int change_aout(char *objfile, int update_symtable)
+ return errno;
+ }
+ #ifdef __linux__
+- if (fread(&bsd,sizeof(gnu),1,f) != 1 ) {
++ if (fread(&bsd,sizeof(bsd),1,f) != 1 ) {
+ fclose(f);
+ return -1;
+ }
+--
+1.8.3.2
+
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.23 2013/02/08 05:12:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.24 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -75,7 +75,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
pulseaudio? ( media-sound/pulseaudio )
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.16 2013/02/08 05:12:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.17 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -73,7 +73,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.10 2013/02/08 05:12:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.11 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -77,7 +77,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.ebuild,v 1.14 2013/02/08 05:12:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.ebuild,v 1.15 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -77,7 +77,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.0.ebuild,v 1.13 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.0.ebuild,v 1.14 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -78,7 +78,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.1.ebuild,v 1.11 2013/02/08 05:12:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.1.ebuild,v 1.12 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -77,7 +77,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.5 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.6 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -85,7 +85,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.5 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.6 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -85,7 +85,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.5 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.6 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -85,7 +85,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.5 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.6 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -85,7 +85,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.14-r1.ebuild,v 1.5 2013/03/13 17:52:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.14-r1.ebuild,v 1.6 2013/08/05 09:31:06 ssuominen Exp $
EAPI="5"
@@ -85,7 +85,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
virtual/opengl
)
gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:= )
+ jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:0= )
mp3? ( >=media-sound/mpg123-1.5.0 )
Oops, something went wrong.

0 comments on commit de91872

Please sign in to comment.