Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 190595202b90cf916ad6ebb4da8cdba83b4dc19b
  foo-overlay: 49364501b49e209c1e5602ddde1dd6531e118fab
  bar-overlay: 78a0865873ba50e93705d46779fd9344e60a9af3
  flora: 99d9aa6d003a1788a3448c6cc33412403fa3f852
  mythtv: 774a102d15bb933fb5453c613aa2a70cdc414bf3
  • Loading branch information...
commit 9aabd0e8ab8e2f4d856f3c85aad87f314825df7b 1 parent d2782f1
@danielrobbins danielrobbins authored
Showing with 3,227 additions and 305 deletions.
  1. +13 −0 app-dicts/gjiten/files/gjiten-2.6-pref.patch
  2. +57 −0 app-dicts/gjiten/gjiten-2.6-r2.ebuild
  3. +2 −2 app-emulation/libvirt/libvirt-0.10.2-r1.ebuild
  4. +2 −2 app-emulation/libvirt/libvirt-0.10.2.ebuild
  5. +2 −2 app-emulation/libvirt/libvirt-9999.ebuild
  6. +2 −2 app-emulation/virtinst/virtinst-0.600.3.ebuild
  7. +4 −0 app-emulation/wine/Manifest
  8. +3 −0  app-emulation/wine/metadata.xml
  9. +266 −0 app-emulation/wine/wine-1.5.15-r1.ebuild
  10. +261 −0 app-emulation/wine/wine-1.5.15.ebuild
  11. +20 −10 app-emulation/wine/wine-9999.ebuild
  12. +340 −0 app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
  13. +179 −0 app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild
  14. +191 −0 app-misc/g15daemon/g15daemon-9999.ebuild
  15. +100 −0 dev-libs/libg15/files/g15tools.patch
  16. +2 −2 dev-libs/libg15/libg15-1.2.7-r1.ebuild
  17. +5 −3 dev-libs/libg15/libg15-9999.ebuild
  18. +58 −0 dev-libs/libg15render/libg15render-9999.ebuild
  19. +3 −3 dev-php/pecl-imagick/pecl-imagick-3.0.1-r1.ebuild
  20. +1 −0  dev-python/python-irclib/Manifest
  21. +36 −0 dev-python/python-irclib/python-irclib-3.2.2.ebuild
  22. +2 −2 dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
  23. +2 −2 dev-util/debhelper/debhelper-9.20120909.ebuild
  24. +1 −2  games-fps/urbanterror/urbanterror-4.2.002.ebuild
  25. +2 −2 media-libs/libextractor/libextractor-1.0.0.ebuild
  26. +2 −2 media-libs/libpng/libpng-1.2.50.ebuild
  27. +2 −2 media-libs/libpng/libpng-1.5.13-r1.ebuild
  28. +1 −1  media-libs/libsmf/Manifest
  29. +2 −2 media-libs/libsmf/libsmf-1.3.ebuild
  30. +8 −6 media-sound/teamspeak-server-bin/Manifest
  31. +56 −0 media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
  32. +1 −1  metadata/dtd/timestamp.chk
  33. +1 −1  metadata/glsa/timestamp.chk
  34. +14 −0 metadata/md5-cache/app-dicts/gjiten-2.6-r2
  35. +3 −3 metadata/md5-cache/app-emulation/libvirt-0.10.2
  36. +3 −3 metadata/md5-cache/app-emulation/libvirt-0.10.2-r1
  37. +3 −3 metadata/md5-cache/app-emulation/libvirt-9999
  38. +2 −2 metadata/md5-cache/app-emulation/virtinst-0.600.3
  39. +15 −0 metadata/md5-cache/app-emulation/wine-1.5.15
  40. +15 −0 metadata/md5-cache/app-emulation/wine-1.5.15-r1
  41. +5 −5 metadata/md5-cache/app-emulation/wine-9999
  42. +12 −0 metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r6
  43. +11 −0 metadata/md5-cache/app-misc/g15daemon-9999
  44. +1 −1  metadata/md5-cache/dev-libs/libg15-1.2.7-r1
  45. +1 −2  metadata/md5-cache/dev-libs/libg15-9999
  46. +11 −0 metadata/md5-cache/dev-libs/libg15render-9999
  47. +2 −2 metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
  48. +14 −0 metadata/md5-cache/dev-python/python-irclib-3.2.2
  49. +2 −2 metadata/md5-cache/dev-ruby/uuidtools-2.1.3
  50. +2 −2 metadata/md5-cache/dev-util/debhelper-9.20120909
  51. +1 −1  metadata/md5-cache/games-fps/urbanterror-4.2.002
  52. +2 −2 metadata/md5-cache/media-libs/libextractor-1.0.0
  53. +2 −2 metadata/md5-cache/media-libs/libpng-1.2.50
  54. +2 −2 metadata/md5-cache/media-libs/libpng-1.5.13-r1
  55. +2 −2 metadata/md5-cache/media-libs/libsmf-1.3
  56. +11 −0 metadata/md5-cache/media-sound/teamspeak-server-bin-3.0.6.1
  57. +1 −1  metadata/md5-cache/net-dns/bind-9.9.2
  58. +13 −0 metadata/md5-cache/net-firewall/shorewall-4.5.8.2
  59. +12 −0 metadata/md5-cache/net-firewall/shorewall-core-4.5.8.2
  60. +12 −0 metadata/md5-cache/net-firewall/shorewall-lite-4.5.8.2
  61. +12 −0 metadata/md5-cache/net-firewall/shorewall6-4.5.8.2
  62. +12 −0 metadata/md5-cache/net-firewall/shorewall6-lite-4.5.8.2
  63. +2 −2 metadata/md5-cache/net-im/emesene-2.12.9
  64. +10 −0 metadata/md5-cache/net-mail/mailbase-1.1
  65. +1 −1  metadata/md5-cache/net-misc/dhcp-4.2.4_p2-r1
  66. +3 −3 metadata/md5-cache/net-misc/ifenslave-1.1.0-r3
  67. +3 −3 metadata/md5-cache/net-misc/ifenslave-1.1.0-r4
  68. +3 −3 metadata/md5-cache/net-misc/ifenslave-1.1.0-r5
  69. +3 −3 metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
  70. +1 −1  metadata/md5-cache/net-misc/openssh-6.1_p1
  71. +1 −1  metadata/md5-cache/net-misc/remmina-1.0.0_p20121004
  72. +2 −2 metadata/md5-cache/net-misc/ssh-askpass-fullscreen-0.4-r4
  73. +2 −2 metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0
  74. +12 −0 metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
  75. +2 −2 metadata/md5-cache/sys-apps/nawk-20110810-r1
  76. +2 −2 metadata/md5-cache/sys-fs/fuse-2.9.1-r1
  77. +15 −0 metadata/md5-cache/sys-kernel/gentoo-sources-3.6.2
  78. +13 −0 metadata/md5-cache/www-client/chromium-23.0.1271.26
  79. +1 −1  metadata/md5-cache/www-servers/apache-2.4.3
  80. +13 −0 metadata/md5-cache/x11-misc/lightdm-1.4.0
  81. +2 −2 metadata/md5-cache/x11-misc/macopix-1.7.4
  82. +3 −3 metadata/md5-cache/x11-misc/xteddy-2.2
  83. +2 −2 metadata/md5-cache/x11-themes/iceicons-0.10.0
  84. +2 −2 metadata/md5-cache/x11-themes/ubuntu-wallpapers-0.34.1
  85. +1 −1  metadata/news/timestamp.chk
  86. +1 −1  metadata/timestamp
  87. +1 −1  metadata/timestamp.chk
  88. +1 −1  metadata/timestamp.x
  89. +2 −3 net-dns/bind/bind-9.9.2.ebuild
  90. +1 −0  net-firewall/shorewall-core/Manifest
  91. +22 −0 net-firewall/shorewall-core/files/shorewallrc_new
  92. +40 −0 net-firewall/shorewall-core/shorewall-core-4.5.8.2.ebuild
  93. +2 −0  net-firewall/shorewall-lite/Manifest
  94. +22 −0 net-firewall/shorewall-lite/files/shorewallrc_new
  95. +51 −0 net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild
  96. +2 −0  net-firewall/shorewall/Manifest
  97. +22 −0 net-firewall/shorewall/files/shorewallrc_new
  98. +63 −0 net-firewall/shorewall/shorewall-4.5.8.2.ebuild
  99. +2 −0  net-firewall/shorewall6-lite/Manifest
  100. +22 −0 net-firewall/shorewall6-lite/files/shorewallrc_new
  101. +57 −0 net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild
  102. +2 −0  net-firewall/shorewall6/Manifest
  103. +22 −0 net-firewall/shorewall6/files/shorewallrc_new
  104. +61 −0 net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild
  105. +1 −2  net-im/emesene/emesene-2.12.9.ebuild
  106. +70 −0 net-mail/mailbase/mailbase-1.1.ebuild
  107. +2 −2 net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
  108. +2 −2 net-misc/ifenslave/Manifest
  109. +6 −3 net-misc/ifenslave/ifenslave-1.1.0-r3.ebuild
  110. +6 −3 net-misc/ifenslave/ifenslave-1.1.0-r4.ebuild
  111. +6 −3 net-misc/ifenslave/ifenslave-1.1.0-r5.ebuild
  112. +5 −2 net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
  113. +2 −1  net-misc/openssh/openssh-6.1_p1.ebuild
  114. +0 −51 net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
  115. +0 −43 net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
  116. +0 −45 net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
  117. +68 −0 net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch
  118. +2 −1  net-misc/remmina/remmina-1.0.0_p20121004.ebuild
  119. +27 −0 net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
  120. +2 −2 net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild
  121. +35 −0 net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
  122. +2 −2 net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild
  123. +6 −1 profiles/base/package.use.mask
  124. +1 −0  profiles/use.local.desc
  125. +2 −2 sys-apps/nawk/nawk-20110810-r1.ebuild
  126. +2 −2 sys-fs/fuse/fuse-2.9.1-r1.ebuild
  127. +2 −0  sys-kernel/gentoo-sources/Manifest
  128. +29 −0 sys-kernel/gentoo-sources/gentoo-sources-3.6.2.ebuild
  129. +1 −0  www-client/chromium/Manifest
  130. +502 −0 www-client/chromium/chromium-23.0.1271.26.ebuild
  131. +2 −2 www-servers/apache/apache-2.4.3.ebuild
  132. +1 −0  x11-misc/lightdm/Manifest
  133. +111 −0 x11-misc/lightdm/lightdm-1.4.0.ebuild
  134. +2 −2 x11-misc/macopix/macopix-1.7.4.ebuild
  135. +2 −2 x11-misc/xteddy/Manifest
  136. +4 −2 x11-misc/xteddy/xteddy-2.2.ebuild
  137. +2 −2 x11-themes/iceicons/iceicons-0.10.0.ebuild
  138. +2 −2 x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild
View
13 app-dicts/gjiten/files/gjiten-2.6-pref.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pref.c b/src/pref.c
+index 9c5e07d..6c0e13d 100644
+--- a/src/pref.c
++++ b/src/pref.c
+@@ -271,7 +271,7 @@ static void up_dict(GtkWidget *button) {
+ gtk_list_store_swap(GTK_LIST_STORE(model), &iter, &tmpiter);
+ }
+ }
+- g_free(treepath);
++ gtk_tree_path_free(treepath);
+ }
+
+
View
57 app-dicts/gjiten/gjiten-2.6-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.6-r2.ebuild,v 1.1 2012/10/12 23:55:24 naota Exp $
+
+EAPI=2
+inherit autotools eutils gnome2
+
+DESCRIPTION="A Japanese dictionary program for Gnome"
+HOMEPAGE="http://gjiten.sourceforge.net/"
+SRC_URI="http://gjiten.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND=">=gnome-base/libgnome-2.2
+ >=gnome-base/libgnomeui-2.2
+ >=gnome-base/libglade-2"
+DEPEND="${RDEPEND}
+ app-text/rarian
+ dev-util/intltool
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_prepare() {
+ gnome2_src_prepare
+ epatch "${FILESDIR}"/${P}-pref.patch
+ # bug #124631
+ intltoolize --copy --automake --force || die "intltoolize failed"
+ AM_OPTS="--foreign" eautoreconf
+}
+
+pkg_postinst() {
+ elog
+ elog "Dictionary files are necessary in order for"
+ elog "Gjiten to function."
+ elog
+ elog "Download dictionary files from:"
+ elog "http://ftp.cc.monash.edu.au/pub/nihongo/00INDEX.html#dic_fil"
+ elog "You need kanjidic and edict at a minimum. Dictionary files"
+ elog "must be converted to UTF-8 format - check the Gjiten help"
+ elog "and README files for details."
+ elog
+ elog "A shell script is available from "
+ elog "the Gjiten homepage(${HOMEPAGE}) to"
+ elog "download and convert the dictionary files, but you need"
+ elog "to put the files in /usr/share/gjiten after running the script."
+ elog
+
+ gnome2_pkg_postinst
+}
View
4 app-emulation/libvirt/libvirt-0.10.2-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-emulation/libvirt/libvirt-0.10.2-r1.ebuild,v 1.2 2012/10/09 20:35:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r1.ebuild,v 1.3 2012/10/12 22:53:59 cardoe Exp $
EAPI=4
@@ -58,6 +58,7 @@ RDEPEND="sys-libs/readline
>=dev-libs/libxml2-2.7.6
dev-libs/libnl:3
>=net-libs/gnutls-1.0.25
+ net-libs/libssh2
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
@@ -80,7 +81,6 @@ RDEPEND="sys-libs/readline
sys-fs/lvm2
)
pcap? ( >=net-libs/libpcap-1.0.0 )
- phyp? ( net-libs/libssh2 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
View
4 app-emulation/libvirt/libvirt-0.10.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-emulation/libvirt/libvirt-0.10.2.ebuild,v 1.3 2012/10/09 20:35:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2.ebuild,v 1.4 2012/10/12 22:53:59 cardoe Exp $
EAPI=4
@@ -58,6 +58,7 @@ RDEPEND="sys-libs/readline
>=dev-libs/libxml2-2.7.6
dev-libs/libnl:3
>=net-libs/gnutls-1.0.25
+ net-libs/libssh2
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
@@ -80,7 +81,6 @@ RDEPEND="sys-libs/readline
sys-fs/lvm2
)
pcap? ( >=net-libs/libpcap-1.0.0 )
- phyp? ( net-libs/libssh2 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
View
4 app-emulation/libvirt/libvirt-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-emulation/libvirt/libvirt-9999.ebuild,v 1.40 2012/09/30 05:07:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.41 2012/10/12 22:53:59 cardoe Exp $
EAPI=4
@@ -57,6 +57,7 @@ RDEPEND="sys-libs/readline
>=dev-libs/libxml2-2.7.6
dev-libs/libnl:1.1
>=net-libs/gnutls-1.0.25
+ net-libs/libssh2
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
@@ -79,7 +80,6 @@ RDEPEND="sys-libs/readline
sys-fs/lvm2
)
pcap? ( >=net-libs/libpcap-1.0.0 )
- phyp? ( net-libs/libssh2 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
|| ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
View
4 app-emulation/virtinst/virtinst-0.600.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.3.ebuild,v 1.1 2012/08/04 19:19:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.3.ebuild,v 1.2 2012/10/12 17:41:33 ago Exp $
#BACKPORTS=2
@@ -24,7 +24,7 @@ else
SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Python modules for starting virtualized guest installations"
View
4 app-emulation/wine/Manifest
@@ -9,6 +9,7 @@ DIST wine-1.5.11.tar.bz2 20651401 SHA256 2854c853546ded26e9c15ba43c29ceace72b781
DIST wine-1.5.12.tar.bz2 20652437 SHA256 ba987a0e3b1d5c0ba2d42fecdcff1c4e910d7c9949d9baca796b8b5c1318662c SHA512 c16ca8a6343a40f5a287fa123c9d03d6bc60b1e9bd9642cfa94fc473e2acd8bed56d442a149ac590b00292494795aa3b23e3c021990c3ca444641a4899d9a947 WHIRLPOOL 834b79863c158113a3cc71507371110c269aea8edb00bcb9cacadcf5d69a6389bf1836a19d3c9ad6e9b1593aaf02c8f1f90d9cea3149b42a3089983addfcd233
DIST wine-1.5.13.tar.bz2 20669180 SHA256 c05dd12ecc5256219d09cc1daad6f2153368d69ef15c68400a2a404b79b079d1 SHA512 51aede2c4600193bedb6a392ede1ddce1ec9f92d32f7aba03f3d4e46361c8377969a75a6fac4a0179da8fa0905fe8e719bdde9b23187692b6ab6b0c28b444890 WHIRLPOOL 215ba06603ce8a2d6c03931cd9f5a66da092349a09cf1eaf8e7fd8fbf596eb8d7147f8c54b6eae333b9446dd0a314507d7b2e2c1dc6521d5ff7064db77f148fa
DIST wine-1.5.14.tar.bz2 20745798 SHA256 3e70ff0f900bf459dd6fa767bdac5543a27b76364f8ef89088300b867351df42 SHA512 952dbf1aba41f4144411a3f670ffca1d6b331e60ca8cb6fc36bd590a5ad115920fc6fccddcf15d517e4c02bd28ea67ee8631098da73d81f3b92ed5a189942f85 WHIRLPOOL a369f7f1162ba275436dac9826f5f086ba07ba0f803d615e2a2f09043a651bf77b8c9a9f9394f114e93dc7e6ef868bf8fc07dfc75deed90497e5cd39e4d22e68
+DIST wine-1.5.15.tar.bz2 20844051 SHA256 2642698204bbc5d9fd04c30f3507fa08a62fa3b0a21e53cdfd2c5a4530b69454 SHA512 d9197f1930830bcbcf2f11c0e889e5a20c8a30b8b8c3ed451aefb34735417cbce6109b6985bf89451684b20f281e1ea722214b2e465ce21caf9f034f21291ed1 WHIRLPOOL 32264bc8fc6ed73e5123e0979c3c33488e6dccb7b8b2e7b3c5d61761784b99b0b51567b5f9e15c91d2565640ac19dff9ae91469ff8dfb72fafd99c47dbc5655b
DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5
DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068
@@ -29,7 +30,10 @@ DIST wine_gecko-1.6-x86.msi 16802816 SHA256 1f2c201b970c2ec3dbfd35c29530edf4aaf1
DIST wine_gecko-1.6-x86_64.msi 17251328 SHA256 9f27fd2f67a10e01f9960707cbe365e795003050529af63fc68bc1192580801b SHA512 be49b579ed881fcf21980fa76e7be7891ebdfb6dd452646f8b7a8204e1b2ca1995e5d745252686fb4ccc25213e2aaf02a0d8a13b32e773095fbffba3878227df WHIRLPOOL 9ee867e2a6e25e3f90618a2cee7c32be639743454bf89429ed831aee04bdda6bb14cd3c5772bad1a3e8b9ac7758da9745cdf4f2470e859691b0f8fb0f76b367d
DIST wine_gecko-1.7-x86.msi 16995328 SHA256 2ed524e79cc88137b28430389af19cb032989311921462a29f72d6f121954913 SHA512 c17308ebcaaa947729dcfcc73736ec4f0ed559744eb89fc7b60afab9bc6c67044dc4885209ac79104ef0f957e842162ad8beb1535236c0fa2ed0dab6b0133636 WHIRLPOOL cba9e7276783c3fa828a948c6c5bca3a01329dd768f0768f310624aab70bcafb94dca1789ad77670dfc5c737da0a21342641997c0697d7c2a337b9e15555363b
DIST wine_gecko-1.7-x86_64.msi 17438720 SHA256 19d0364a43621738fa3fd1713ef9590ad0cc61ea4c8858ad3f8703a81b13c927 SHA512 04928aab0ba3ab90074085f9198e46372701249863b6710ed4ffc0c92e0ffc30348a41be528c7c1dec9007441cc1f3d3aa1193e469ac75f5ae635df52dac4dd7 WHIRLPOOL 389ae0eb32b2ea994cac9fdb0fd785bb457489063657040f54a5dd74c74483396772b18bbb0e7b4d86c1036d52a21d0d68610a458842e79e2c2567301d3e1659
+DIST wine_gecko-1.8-x86.msi 17774592 SHA256 28f3b7e497e1f884a64b2d982b61dda3167efac4c843de198654a1c9144ff9dc SHA512 81cfa990dde3f19e263ecf2957892201a88fd3c683d448d915348f7d8469e03d21c1c724b982f7a65b931857498822d8f6f6cc724205948b462013c0df6064dd WHIRLPOOL 98824a561892a3e0111d7a3becb9a8f4ac7e9dc02c4b612c7c074b2e77ea2f56d85c0666c9cb22f95f6a79b2f43c74f27b533837ffb0ae19e514f5709c2a24ea
+DIST wine_gecko-1.8-x86_64.msi 18238976 SHA256 53a600a4767225469fd68431263baac0672ceaec29eb2c7747b4363fd2856db2 SHA512 336527adbc6342fe149d706a05e23a51eb25e54e8ce88e67aa98717a1486bc85d36989315b6a2a428ddc10844bbc9130e76625741d997230a541756b429db1e9 WHIRLPOOL 0f40c5d5177335c6736983d37ee677b4ea183260df07d516bca17ff8327d6024693dec3707db934632bf253cf94614127e60c4e7399de764a3a6c5d59e37c54d
DIST winepulse-0.35-configure.ac.patch 2826 SHA256 837bffaaddb6b7b0a474c7262a57f12e250e135cf6228dde1a22849f66de1250 SHA512 cb7a86c75cfca401e12ab117407cbae95c7aecffed37d1843e5b58bfdeb54212cb7c4b783280cc94afa0f1c9e58ebb61e28627ed3b690e099cd539d052cbd3bc WHIRLPOOL eb03bfc3e01798c3203814f9b7cf73bf1839ae3563d464f569166285c035b9e2f5f2d74b1238dc141ae1ec67a9e6be4f87d558014f490f43fa990ad19dea5121
DIST winepulse-0.36.patch 101815 SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05 SHA512 9b9ca1284c6f8f1108a0456989dd0e7a3a35a3075dd5e6601e84d91e65a60a263992736a16c432a7ca75f40e9dc904cdb546b51acd1508b78cbaff060a461d6f WHIRLPOOL d00f9ebd163b632c9cdf3d6581cc9c010b7c0db4c96666591dc4fc1aa48bac030def35964a4dca9c9405ab32b51eaecf2f392b0f57771bc2dd04f5bc2603e789
DIST winepulse-0.38-winecfg.patch 13088 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e SHA512 714358ec1c1251fde97430e6a3342a8a455f5bf56f1f57f895c6ebaf73e4c396f15f7b12d0f8e02822526e1b4d19a6f161b53ad7c7dd6db1cf8516c95352404f WHIRLPOOL 9e34956d2da028fed29112791bd8497fcdf8b7de8f5f04903b411f091bbe57a8b8ea647a829ab04fcf08ebc5e59d96029e855fbd20a99ae222aad9b322925ab0
DIST winepulse-2012.06.15.patch 100596 SHA256 f6baf816e6170c406607d81e298fea2d175452ca822ee4cd2748fe4381ecd4dc SHA512 cd14a3407820d5d7b64a1ea19e41ae816a6a06888d57314cd7314192744574885501c98fa9e9f0fb102d3427d9f7bcc4f1a5ac532947b89db52ef731e071cb69 WHIRLPOOL 2dbb40afb633f5b1238d8849825b4711de865033ebb5c8f04c8e930a2974b8a5f4958fe87b5c1a9ccb1417ab1f4fbd2ed37feec11d2212efa01a6e05171a06a6
+DIST winepulse-patches-1.5.15.tar.bz2 39808 SHA256 373291b020308d639ee12a05cb94f74ad9bb7cdd1024d5406067421b0aac0713 SHA512 0bd2e04922a144aa5f1ddc6fea9deb383bce934176f3e485f41a77007512720e2d68131c1e6002167673a2df8431a820fb009afd440bf05123ff40872deffb2b WHIRLPOOL 96a6ce6b01a1a2137bbe6963734bd19b32f9b27e57b1dd81f9934e2f8718ec534815fd45f7c5a70389af69a6eceee2024dbc9d90833f8444699afe29c2e1df9d
View
3  app-emulation/wine/metadata.xml
@@ -14,6 +14,9 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
<flag name='opencl'>Enable OpenCL support</flag>
<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
+ <flag name='osmesa-multilib'>Enable libOSMesa support for Win32 on amd64.
+ WARNING: you must install an appropriate version of 32-bit libOSMesa manually
+ or from an overlay; see bug #430268</flag>
<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
<flag name='samba'>Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
View
266 app-emulation/wine/wine-1.5.15-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r1.ebuild,v 1.1 2012/10/13 00:19:19 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ inherit git-2
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.4"
+PULSE_PATCHES="winepulse-patches-1.5.15"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+ win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa osmesa-multilib +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+ mono? ( || ( win32 !win64 ) )
+ osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+ truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+ X? (
+ >=app-emulation/emul-linux-x86-xlibs-2.1
+ >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+ )
+ mp3? ( app-emulation/emul-linux-x86-soundlibs )
+ odbc? ( app-emulation/emul-linux-x86-db )
+ openal? ( app-emulation/emul-linux-x86-sdl )
+ opengl? ( app-emulation/emul-linux-x86-opengl )
+ scanner? ( app-emulation/emul-linux-x86-medialibs )
+ v4l? ( app-emulation/emul-linux-x86-medialibs )
+ app-emulation/emul-linux-x86-baselibs
+ >=sys-kernel/linux-headers-2.6
+ )"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2 )
+ fontconfig? ( media-libs/fontconfig )
+ gphoto2? ( media-libs/libgphoto2 )
+ openal? ( media-libs/openal )
+ udisks? (
+ sys-apps/dbus
+ sys-fs/udisks:2
+ )
+ gnutls? ( net-libs/gnutls )
+ gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm )
+ jpeg? ( virtual/jpeg )
+ ldap? ( net-nds/openldap )
+ lcms? ( =media-libs/lcms-1* )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pulseaudio? (
+ media-sound/pulseaudio
+ sys-auth/rtkit
+ )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends )
+ ssl? ( dev-libs/openssl )
+ png? ( media-libs/libpng )
+ v4l? ( media-libs/libv4l )
+ !win64? ( ${MLIB_DEPS} )
+ win32? ( ${MLIB_DEPS} )
+ xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ !hardened? ( sys-devel/prelink )
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+src_unpack() {
+ if use win64 ; then
+ [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+ && die "you need gcc-4.4+ to build 64bit wine"
+ fi
+
+ if use win32 && use opencl; then
+ [[ x$(eselect opencl show) = "xintel" ]] &&
+ die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+ fi
+
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ else
+ unpack ${MY_P}.tar.bz2
+ fi
+
+ unpack "${PULSE_PATCHES}.tar.bz2"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+ epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+ epatch "../${PULSE_PATCHES}"/*.patch #421365
+ epatch_user #282735
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ eautoreconf
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+ local builddir="${WORKDIR}/wine$1"
+ mkdir -p "${builddir}"
+ pushd "${builddir}" >/dev/null
+
+ with_osmesa=$(use_with osmesa)
+ if use amd64 && [[ $1 = 32 ]]; then #430268
+ if use osmesa-multilib; then
+ with_osmesa=--with-osmesa
+ else
+ elog "win32 osmesa support is disabled for now, see bug #430268"
+ with_osmesa=--without-osmesa
+ fi
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --sysconfdir=/etc/wine \
+ $(use_with alsa) \
+ $(use_with capi) \
+ $(use_with lcms cms) \
+ $(use_with cups) \
+ $(use_with ncurses curses) \
+ $(use_with udisks dbus) \
+ $(use_with fontconfig) \
+ $(use_with gnutls) \
+ $(use_with gphoto2 gphoto) \
+ $(use_with gsm) \
+ $(use_with gstreamer) \
+ --without-hal \
+ $(use_with jpeg) \
+ $(use_with ldap) \
+ $(use_with mp3 mpg123) \
+ $(use_with nls gettext) \
+ $(use_with openal) \
+ $(use_with opencl) \
+ $(use_with opengl) \
+ $(use_with ssl openssl) \
+ ${with_osmesa} \
+ $(use_with oss) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with pulseaudio pulse) \
+ $(use_with scanner sane) \
+ $(use_enable test tests) \
+ $(use_with truetype freetype) \
+ $(use_with v4l) \
+ $(use_with X x) \
+ $(use_with xcomposite) \
+ $(use_with xinerama) \
+ $(use_with xml) \
+ $(use_with xml xslt) \
+ $2
+
+ emake -j1 depend
+
+ popd >/dev/null
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ if use win64 ; then
+ do_configure 64 --enable-win64
+ use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+ else
+ ABI=x86 do_configure 32 --disable-win64
+ fi
+}
+
+src_compile() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" all
+ done
+}
+
+src_install() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" install DESTDIR="${D}"
+ done
+ dodoc ANNOUNCE AUTHORS README
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ if use win32 || ! use win64; then
+ pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ fi
+ use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use win64 && ! use win32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+}
View
261 app-emulation/wine/wine-1.5.15.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15.ebuild,v 1.1 2012/10/12 21:17:20 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ inherit git-2
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.4"
+PULSE_PATCH="winepulse-2012.06.15.patch"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+ win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ http://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa osmesa-multilib +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+ mono? ( || ( win32 !win64 ) )
+ osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+ truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+ X? (
+ >=app-emulation/emul-linux-x86-xlibs-2.1
+ >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+ )
+ mp3? ( app-emulation/emul-linux-x86-soundlibs )
+ odbc? ( app-emulation/emul-linux-x86-db )
+ openal? ( app-emulation/emul-linux-x86-sdl )
+ opengl? ( app-emulation/emul-linux-x86-opengl )
+ scanner? ( app-emulation/emul-linux-x86-medialibs )
+ v4l? ( app-emulation/emul-linux-x86-medialibs )
+ app-emulation/emul-linux-x86-baselibs
+ >=sys-kernel/linux-headers-2.6
+ )"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2 )
+ fontconfig? ( media-libs/fontconfig )
+ gphoto2? ( media-libs/libgphoto2 )
+ openal? ( media-libs/openal )
+ udisks? (
+ sys-apps/dbus
+ sys-fs/udisks:2
+ )
+ gnutls? ( net-libs/gnutls )
+ gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm )
+ jpeg? ( virtual/jpeg )
+ ldap? ( net-nds/openldap )
+ lcms? ( =media-libs/lcms-1* )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends )
+ ssl? ( dev-libs/openssl )
+ png? ( media-libs/libpng )
+ v4l? ( media-libs/libv4l )
+ !win64? ( ${MLIB_DEPS} )
+ win32? ( ${MLIB_DEPS} )
+ xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ !hardened? ( sys-devel/prelink )
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+src_unpack() {
+ if use win64 ; then
+ [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+ && die "you need gcc-4.4+ to build 64bit wine"
+ fi
+
+ if use win32 && use opencl; then
+ [[ x$(eselect opencl show) = "xintel" ]] &&
+ die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+ fi
+
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ else
+ unpack ${MY_P}.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+ epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+ epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+ epatch_user #282735
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ eautoreconf
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+ local builddir="${WORKDIR}/wine$1"
+ mkdir -p "${builddir}"
+ pushd "${builddir}" >/dev/null
+
+ with_osmesa=$(use_with osmesa)
+ if use amd64 && [[ $1 = 32 ]]; then #430268
+ if use osmesa-multilib; then
+ with_osmesa=--with-osmesa
+ else
+ elog "win32 osmesa support is disabled for now, see bug #430268"
+ with_osmesa=--without-osmesa
+ fi
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --sysconfdir=/etc/wine \
+ $(use_with alsa) \
+ $(use_with capi) \
+ $(use_with lcms cms) \
+ $(use_with cups) \
+ $(use_with ncurses curses) \
+ $(use_with udisks dbus) \
+ $(use_with fontconfig) \
+ $(use_with gnutls) \
+ $(use_with gphoto2 gphoto) \
+ $(use_with gsm) \
+ $(use_with gstreamer) \
+ --without-hal \
+ $(use_with jpeg) \
+ $(use_with ldap) \
+ $(use_with mp3 mpg123) \
+ $(use_with nls gettext) \
+ $(use_with openal) \
+ $(use_with opencl) \
+ $(use_with opengl) \
+ $(use_with ssl openssl) \
+ ${with_osmesa} \
+ $(use_with oss) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with pulseaudio pulse) \
+ $(use_with scanner sane) \
+ $(use_enable test tests) \
+ $(use_with truetype freetype) \
+ $(use_with v4l) \
+ $(use_with X x) \
+ $(use_with xcomposite) \
+ $(use_with xinerama) \
+ $(use_with xml) \
+ $(use_with xml xslt) \
+ $2
+
+ emake -j1 depend
+
+ popd >/dev/null
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ if use win64 ; then
+ do_configure 64 --enable-win64
+ use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+ else
+ ABI=x86 do_configure 32 --disable-win64
+ fi
+}
+
+src_compile() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" all
+ done
+}
+
+src_install() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" install DESTDIR="${D}"
+ done
+ dodoc ANNOUNCE AUTHORS README
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ if use win32 || ! use win64; then
+ pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ fi
+ use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use win64 && ! use win32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+}
View
30 app-emulation/wine/wine-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-emulation/wine/wine-9999.ebuild,v 1.115 2012/09/10 06:02:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.117 2012/10/13 00:19:19 tetromino Exp $
EAPI="4"
@@ -18,9 +18,9 @@ else
S=${WORKDIR}/${MY_P}
fi
-GV="1.7"
+GV="1.8"
MV="0.0.4"
-PULSE_PATCH="winepulse-2012.06.15.patch"
+PULSE_PATCHES="winepulse-patches-1.5.15"
DESCRIPTION="free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@@ -29,11 +29,11 @@ SRC_URI="${SRC_URI}
win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- http://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}"
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa osmesa-multilib +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
REQUIRED_USE="elibc_glibc? ( threads )
mono? ( || ( win32 !win64 ) )
osmesa? ( opengl )" #286560
@@ -69,6 +69,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
X? (
x11-libs/libXcursor
+ x11-libs/libXext
x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXmu
@@ -90,7 +91,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
nls? ( sys-devel/gettext )
odbc? ( dev-db/unixODBC )
osmesa? ( media-libs/mesa[osmesa] )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? (
+ media-sound/pulseaudio
+ sys-auth/rtkit
+ )
samba? ( >=net-fs/samba-3.0.25 )
selinux? ( sec-policy/selinux-wine )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -129,6 +133,8 @@ src_unpack() {
else
unpack ${MY_P}.tar.bz2
fi
+
+ unpack "${PULSE_PATCHES}.tar.bz2"
}
src_prepare() {
@@ -136,7 +142,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
- epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+ epatch "../${PULSE_PATCHES}"/*.patch #421365
epatch_user #282735
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
@@ -153,9 +159,13 @@ do_configure() {
pushd "${builddir}" >/dev/null
with_osmesa=$(use_with osmesa)
- if use osmesa && use amd64 && [[ $1 = 32 ]]; then #430268
- elog "win32 osmesa support is disabled for now, see bug #430268"
- with_osmesa=--without-osmesa
+ if use amd64 && [[ $1 = 32 ]]; then #430268
+ if use osmesa-multilib; then
+ with_osmesa=--with-osmesa
+ else
+ elog "win32 osmesa support is disabled for now, see bug #430268"
+ with_osmesa=--without-osmesa
+ fi
fi
ECONF_SOURCE=${S} \
View
340 app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
@@ -0,0 +1,340 @@
+From http://sourceforge.net/tracker/?func=detail&aid=3152167&group_id=167869&atid=844658
+
+diff -aNru trunk/g15daemon-wip/plugins/g15_plugin_uinput.c mod/g15daemon-wip/plugins/g15_plugin_uinput.c
+--- trunk/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:50:50.000000000 +0000
++++ mod/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:51:42.000000000 +0000
+@@ -164,146 +164,195 @@
+
+ static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
+ {
+- /* 'G' keys */
+- if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
+- keydown(GKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
+- keyup(GKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
+- keydown(GKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
+- keyup(GKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
+- keydown(GKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
+- keyup(GKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
+- keydown(GKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
+- keyup(GKEY_OFFSET+3);
+-
+- if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
+- keydown(GKEY_OFFSET+4);
+- else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
+- keyup(GKEY_OFFSET+4);
+-
+- if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
+- keydown(GKEY_OFFSET+5);
+- else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
+- keyup(GKEY_OFFSET+5);
+-
+- if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
+- keydown(GKEY_OFFSET+6);
+- else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
+- keyup(GKEY_OFFSET+6);
+-
+- if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
+- keydown(GKEY_OFFSET+7);
+- else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
+- keyup(GKEY_OFFSET+7);
+-
+- if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
+- keydown(GKEY_OFFSET+8);
+- else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
+- keyup(GKEY_OFFSET+8);
+-
+- if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
+- keydown(GKEY_OFFSET+9);
+- else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
+- keyup(GKEY_OFFSET+9);
+-
+- if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
+- keydown(GKEY_OFFSET+10);
+- else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
+- keyup(GKEY_OFFSET+10);
+-
+- if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
+- keydown(GKEY_OFFSET+11);
+- else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
+- keyup(GKEY_OFFSET+11);
+-
+- if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
+- keydown(GKEY_OFFSET+12);
+- else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
+- keyup(GKEY_OFFSET+12);
+-
+- if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
+- keydown(GKEY_OFFSET+13);
+- else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
+- keyup(GKEY_OFFSET+13);
+-
+- if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
+- keydown(GKEY_OFFSET+14);
+- else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
+- keyup(GKEY_OFFSET+14);
+-
+- if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
+- keydown(GKEY_OFFSET+15);
+- else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
+- keyup(GKEY_OFFSET+15);
+-
+- if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
+- keydown(GKEY_OFFSET+16);
+- else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
+- keyup(GKEY_OFFSET+16);
+-
+- if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
+- keydown(GKEY_OFFSET+17);
+- else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
+- keyup(GKEY_OFFSET+17);
+-
+- /* 'M' keys */
+-
+- if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
+- keydown(MKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
+- keyup(MKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
+- keydown(MKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
+- keyup(MKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
+- keydown(MKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
+- keyup(MKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
+- keydown(MKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
+- keyup(MKEY_OFFSET+3);
+-
+- if(map_Lkeys){
+- /* 'L' keys... */
+- if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
+- keydown(LKEY_OFFSET);
+- else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
+- keyup(LKEY_OFFSET);
+-
+- if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
+- keydown(LKEY_OFFSET+1);
+- else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
+- keyup(LKEY_OFFSET+1);
+-
+- if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
+- keydown(LKEY_OFFSET+2);
+- else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
+- keyup(LKEY_OFFSET+2);
+-
+- if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
+- keydown(LKEY_OFFSET+3);
+- else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
+- keyup(LKEY_OFFSET+3);
+-
+- if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
+- keydown(LKEY_OFFSET+4);
+- else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
+- keyup(LKEY_OFFSET+4);
++ if(!(currentkeys & G15_KEY_LIGHT))
++ {
++ /* 'G' keys */
++ if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++ keydown(GKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++ keyup(GKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++ keydown(GKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++ keyup(GKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++ keydown(GKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++ keyup(GKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++ keydown(GKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++ keyup(GKEY_OFFSET+3);
++
++ if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++ keydown(GKEY_OFFSET+4);
++ else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++ keyup(GKEY_OFFSET+4);
++
++ if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++ keydown(GKEY_OFFSET+5);
++ else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++ keyup(GKEY_OFFSET+5);
++
++ if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++ keydown(GKEY_OFFSET+6);
++ else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++ keyup(GKEY_OFFSET+6);
++
++ if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
++ keydown(GKEY_OFFSET+7);
++ else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
++ keyup(GKEY_OFFSET+7);
++
++ if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
++ keydown(GKEY_OFFSET+8);
++ else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
++ keyup(GKEY_OFFSET+8);
++
++ if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
++ keydown(GKEY_OFFSET+9);
++ else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
++ keyup(GKEY_OFFSET+9);
++
++ if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
++ keydown(GKEY_OFFSET+10);
++ else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
++ keyup(GKEY_OFFSET+10);
++
++ if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
++ keydown(GKEY_OFFSET+11);
++ else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
++ keyup(GKEY_OFFSET+11);
++
++ if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
++ keydown(GKEY_OFFSET+12);
++ else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
++ keyup(GKEY_OFFSET+12);
++
++ if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
++ keydown(GKEY_OFFSET+13);
++ else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
++ keyup(GKEY_OFFSET+13);
++
++ if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
++ keydown(GKEY_OFFSET+14);
++ else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
++ keyup(GKEY_OFFSET+14);
++
++ if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
++ keydown(GKEY_OFFSET+15);
++ else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
++ keyup(GKEY_OFFSET+15);
++
++ if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
++ keydown(GKEY_OFFSET+16);
++ else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
++ keyup(GKEY_OFFSET+16);
++
++ if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
++ keydown(GKEY_OFFSET+17);
++ else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
++ keyup(GKEY_OFFSET+17);
++
++ /* 'M' keys */
++
++ if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
++ keydown(MKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
++ keyup(MKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
++ keydown(MKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
++ keyup(MKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
++ keydown(MKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
++ keyup(MKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
++ keydown(MKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
++ keyup(MKEY_OFFSET+3);
++
++ if(map_Lkeys){
++ /* 'L' keys... */
++ if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
++ keydown(LKEY_OFFSET);
++ else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
++ keyup(LKEY_OFFSET);
++
++ if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
++ keydown(LKEY_OFFSET+1);
++ else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
++ keyup(LKEY_OFFSET+1);
++
++ if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
++ keydown(LKEY_OFFSET+2);
++ else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
++ keyup(LKEY_OFFSET+2);
++
++ if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
++ keydown(LKEY_OFFSET+3);
++ else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
++ keyup(LKEY_OFFSET+3);
++
++ if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
++ keydown(LKEY_OFFSET+4);
++ else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
++ keyup(LKEY_OFFSET+4);
++ }
+ }
++ else
++ {
++ // G15_KEY_LIGHT - Key modifier for Logitech G510 Media Keys implementation
++
++ // XF86AudioPlay
++ if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++ keydown(KEY_PLAYPAUSE);
++ else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++ keyup(KEY_PLAYPAUSE);
++
++ // XF86AudioStop
++ if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++ keydown(KEY_STOPCD);
++ else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++ keyup(KEY_STOPCD);
++
++ // XF86AudioPrev
++ if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++ keydown(KEY_PREVIOUSSONG);
++ else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++ keyup(KEY_PREVIOUSSONG);
++
++ // XF86AudioNext
++ if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++ keydown(KEY_NEXTSONG);
++ else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++ keyup(KEY_NEXTSONG);
++
++ // XF86AudioMute
++ if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++ keydown(KEY_MUTE);
++ else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++ keyup(KEY_MUTE);
++
++ // XF86AudioRaiseVolume
++ if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++ keydown(KEY_VOLUMEUP);
++ else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++ keyup(KEY_VOLUMEUP);
++
++ // XF86AudioLowerVolume
++ if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++ keydown(KEY_VOLUMEDOWN);
++ else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++ keyup(KEY_VOLUMEDOWN);
++ }
+ }
+
+
View
179 app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 Exp $
+
+EAPI=4
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils linux-info perl-module python base
+
+DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+ >=dev-libs/libg15-9999
+ >=dev-libs/libg15render-1.2
+ perl? (
+ dev-lang/perl
+ dev-perl/GDGraph
+ >=dev-perl/Inline-0.4
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-forgotten-open-mode.patch"
+ "${FILESDIR}/${P}-overflow-fix.patch"
+ "${FILESDIR}/${P}-g510-keys.patch"
+)
+
+uinput_check() {
+ ebegin "Checking for uinput support"
+ local rc=1
+ linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+ rc=$?
+
+ if [[ $rc -ne 0 ]] ; then
+ eerror "To use g15daemon, you need to compile your kernel with uinput support."
+ eerror "Please enable uinput support in your kernel config, found at:"
+ eerror
+ eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+ eerror
+ eerror "Once enabled, you should have the /dev/input/uinput device."
+ eerror "g15daemon will not work without the uinput device."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ uinput_check
+ if use python; then
+ python_pkg_setup
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ if use perl; then
+ unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+ fi
+ if use python; then
+ unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+ fi
+}
+
+src_prepare() {
+ if use perl; then
+ perl-module_src_prepare
+ sed -i \
+ -e '1i#!/usr/bin/perl' \
+ "${S}"/contrib/testbindings.pl
+ else
+ # perl-module_src_prepare always calls base_src_prepare
+ base_src_prepare
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ # remove odd docs installed my make
+ rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+ insinto /usr/share/${PN}/contrib
+ doins contrib/xmodmaprc
+ doins contrib/xmodmap.sh
+ if use perl; then
+ doins contrib/testbindings.pl
+ fi
+
+ newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+ dobin "${FILESDIR}/g15daemon-hotplug"
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}/99-g15daemon.rules"
+
+ insinto /etc
+ doins "${FILESDIR}"/g15daemon.conf
+
+ # Gentoo bug #301340, debian bug #611649
+ exeinto /usr/lib/pm-utils/sleep.d
+ doexe "${FILESDIR}"/20g15daemon
+
+ if use perl; then
+ ebegin "Installing Perl Bindings (G15Daemon.pm)"
+ cd "${WORKDIR}/G15Daemon-0.2"
+ docinto perl
+ perl-module_src_install
+ fi
+
+ if use python; then
+ ebegin "Installing Python Bindings (g15daemon.py)"
+ cd "${WORKDIR}/pyg15daemon"
+
+ installation() {
+ insinto $(python_get_sitedir)
+ doins g15daemon.py
+ }
+ python_execute_function installation
+
+ docinto python
+ dodoc AUTHORS
+ fi
+}
+
+pkg_postinst() {
+ if use python; then
+ python_mod_optimize g15daemon.py
+ echo ""
+ fi
+
+ elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+ elog "This can be done with:"
+ elog "# /sbin/rc-update add g15daemon default"
+ elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+ elog ""
+ elog "To have all new keys working in X11, you'll need create a "
+ elog "specific xmodmap in your home directory or edit the existent one."
+ elog ""
+ elog "Create the xmodmap:"
+ elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+ elog ""
+ elog "Adding keycodes to an existing xmodmap:"
+ elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+ if use python; then
+ python_mod_cleanup g15daemon.py
+ fi
+}
View
191 app-misc/g15daemon/g15daemon-9999.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 Exp $
+
+EAPI=4
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+ESVN_PROJECT=${PN}/trunk
+ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip"
+
+inherit eutils linux-info perl-module python base subversion autotools
+
+DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+ >=dev-libs/libg15-9999
+ >=dev-libs/libg15render-9999
+ perl? (
+ dev-lang/perl
+ dev-perl/GDGraph
+ >=dev-perl/Inline-0.4
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+)
+# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
+# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
+
+uinput_check() {
+ ebegin "Checking for uinput support"
+ local rc=1
+ linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+ rc=$?
+
+ if [[ $rc -ne 0 ]] ; then
+ eerror "To use g15daemon, you need to compile your kernel with uinput support."
+ eerror "Please enable uinput support in your kernel config, found at:"
+ eerror
+ eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+ eerror
+ eerror "Once enabled, you should have the /dev/input/uinput device."
+ eerror "g15daemon will not work without the uinput device."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ uinput_check
+ if use python; then
+ python_pkg_setup
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ else
+ unpack ${A}
+ fi
+ if use perl; then
+ unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+ fi
+ if use python; then
+ unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+ fi
+}
+
+src_prepare() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_wc_info
+ fi
+ if use perl; then
+ perl-module_src_prepare
+ sed -i \
+ -e '1i#!/usr/bin/perl' \
+ "${S}"/contrib/testbindings.pl
+ else
+ # perl-module_src_prepare always calls base_src_prepare
+ base_src_prepare
+ fi
+ if [[ ${PV} = *9999* ]]; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${WORKDIR}/G15Daemon-0.2"
+ perl-module_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ # remove odd docs installed my make
+ rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+ insinto /usr/share/${PN}/contrib
+ doins contrib/xmodmaprc
+ doins contrib/xmodmap.sh
+ if use perl; then
+ doins contrib/testbindings.pl
+ fi
+
+ newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+ dobin "${FILESDIR}/g15daemon-hotplug"
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}/99-g15daemon.rules"
+
+ insinto /etc
+ doins "${FILESDIR}"/g15daemon.conf
+
+ # Gentoo bug #301340, debian bug #611649
+ exeinto /usr/lib/pm-utils/sleep.d
+ doexe "${FILESDIR}"/20g15daemon
+
+ if use perl; then
+ ebegin "Installing Perl Bindings (G15Daemon.pm)"
+ cd "${WORKDIR}/G15Daemon-0.2"
+ docinto perl
+ perl-module_src_install
+ fi
+
+ if use python; then
+ ebegin "Installing Python Bindings (g15daemon.py)"
+ cd "${WORKDIR}/pyg15daemon"
+
+ installation() {
+ insinto $(python_get_sitedir)
+ doins g15daemon.py
+ }
+ python_execute_function installation
+
+ docinto python
+ dodoc AUTHORS
+ fi
+}
+
+pkg_postinst() {
+ if use python; then
+ python_mod_optimize g15daemon.py
+ echo ""
+ fi
+
+ elog "To use g15daemon, you need to add g15daemon to the default runlevel."
+ elog "This can be done with:"
+ elog "# /sbin/rc-update add g15daemon default"
+ elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
+ elog ""
+ elog "To have all new keys working in X11, you'll need create a "
+ elog "specific xmodmap in your home directory or edit the existent one."
+ elog ""
+ elog "Create the xmodmap:"
+ elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+ elog ""
+ elog "Adding keycodes to an existing xmodmap:"
+ elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+ if use python; then
+ python_mod_cleanup g15daemon.py
+ fi
+}
View
100 dev-libs/libg15/files/g15tools.patch
@@ -0,0 +1,100 @@
+Patch from upstream bug tracker:
+http://sourceforge.net/tracker/?func=detail&aid=3336448&group_id=167869&atid=844658
+
+As only part of G510 support was merged to upstream. Does NOT apply & compile
+on top of 1.2.7-r1.
+
+diff -aNru trunk/libg15/libg15.c mod/libg15/libg15.c
+--- trunk/libg15/libg15.c 2011-03-31 23:33:44.000000000 +0000
++++ mod/libg15/libg15.c 2011-06-26 07:08:21.000000000 +0000
+@@ -1029,6 +1029,76 @@
+ }
+ }
+
++// Logitech G510 Media Keys implementation. Unknown if this will work for other
++// models. Using the backlight key as a modifier. The assumption is you would
++// normally not be holding down the backlight key while pressing G-keys.
++static void processKeyEvent2Byte(unsigned int *pressed_keys, unsigned char *buffer)
++{
++ // Key modifier
++ *pressed_keys |= G15_KEY_LIGHT;
++
++ // XF86AudioPlay
++ if (*pressed_keys & G15_KEY_G1)
++ *pressed_keys -= G15_KEY_G1;
++
++ // XF86AudioStop
++ if (*pressed_keys & G15_KEY_G2)
++ *pressed_keys -= G15_KEY_G2;
++
++ // XF86AudioPrev
++ if (*pressed_keys & G15_KEY_G3)
++ *pressed_keys -= G15_KEY_G3;
++
++ // XF86AudioNext
++ if (*pressed_keys & G15_KEY_G4)
++ *pressed_keys -= G15_KEY_G4;
++
++ // XF86AudioMute
++ if (*pressed_keys & G15_KEY_G5)
++ *pressed_keys -= G15_KEY_G5;
++
++ // XF86AudioRaiseVolume
++ if (*pressed_keys & G15_KEY_G6)
++ *pressed_keys -= G15_KEY_G6;
++
++ // XF86AudioLowerVolume
++ if (*pressed_keys & G15_KEY_G7)
++ *pressed_keys -= G15_KEY_G7;
++
++ g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x\n", buffer[0], buffer[1]);
++
++ if (buffer[0] == 0x02)
++ {
++ // XF86AudioPlay
++ if (buffer[1] & 0x08)
++ *pressed_keys |= G15_KEY_G1;
++
++ // XF86AudioStop
++ if (buffer[1] & 0x04)
++ *pressed_keys |= G15_KEY_G2;
++
++ // XF86AudioPrev
++ if (buffer[1] & 0x02)
++ *pressed_keys |= G15_KEY_G3;
++
++ // XF86AudioNext
++ if (buffer[1] & 0x01)
++ *pressed_keys |= G15_KEY_G4;
++
++ // XF86AudioMute
++ if (buffer[1] & 0x16)
++ *pressed_keys |= G15_KEY_G5;
++
++ // XF86AudioRaiseVolume
++ if (buffer[1] & 0x32)
++ *pressed_keys |= G15_KEY_G6;
++
++ // XF86AudioLowerVolume
++ if (buffer[1] & 0x64)
++ *pressed_keys |= G15_KEY_G7;
++ }
++}
++
+ int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
+ {
+ unsigned char buffer[G15_KEY_READ_LENGTH];
+@@ -1063,6 +1133,13 @@
+ case 9:
+ processKeyEvent9Byte(pressed_keys, buffer);
+ return G15_NO_ERROR;
++ case 2:
++ if (g15DeviceCapabilities() & G15_DEVICE_G510)
++ {
++ processKeyEvent2Byte(pressed_keys, buffer);
++ return G15_NO_ERROR;
++ }
++ // Deliberate fallthrough
+ default:
+ return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
+ }
View
4 dev-libs/libg15/libg15-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.7-r1.ebuild,v 1.1 2011/09/09 16:55:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-1.2.7-r1.ebuild,v 1.2 2012/10/12 20:01:54 robbat2 Exp $
EAPI=4
View
8 dev-libs/libg15/libg15-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/dev-libs/libg15/libg15-9999.ebuild,v 1.1 2012/10/08 01:53:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15/libg15-9999.ebuild,v 1.2 2012/10/12 20:01:54 robbat2 Exp $
EAPI=4
ESVN_PROJECT=g15tools/trunk
@@ -10,11 +10,11 @@ inherit subversion base eutils autotools
DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI=""
+[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS=""
IUSE=""
DEPEND="=virtual/libusb-0*"
@@ -22,6 +22,8 @@ RDEPEND=${DEPEND}
DOCS=( AUTHORS README ChangeLog )
+PATCHES=( "${FILESDIR}"/g15tools.patch )
+
src_unpack() {
if [[ ${PV} = *9999* ]]; then
subversion_src_unpack
View
58 dev-libs/libg15render/libg15render-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libg15render/libg15render-9999.ebuild,v 1.1 2012/10/12 20:16:27 robbat2 Exp $
+
+EAPI=4
+ESVN_PROJECT=g15tools/trunk
+ESVN_REPO_URI="https://g15tools.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}"
+
+inherit subversion base eutils autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="http://g15tools.sourceforge.net/"
+[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="truetype"
+
+RDEPEND="
+ dev-libs/libg15
+ truetype? ( media-libs/freetype )
+"
+DEPEND=${RDEPEND}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ fi
+}
+
+src_prepare() {
+ # Merged upstream
+ #epatch "${FILESDIR}/${PN}-1.2-pixel-c.patch"
+
+ if [[ ${PV} = *9999* ]]; then
+ subversion_wc_info
+ fi
+ base_src_prepare
+ if [[ ${PV} = *9999* ]]; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable truetype ttf )
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ docdir=/usr/share/doc/${PF} install || die "make install failed"
+ rm "${ED}/usr/share/doc/${PF}/COPYING"
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
View
6 dev-php/pecl-imagick/pecl-imagick-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.0.1-r1.ebuild,v 1.1 2011/12/14 22:39:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.0.1-r1.ebuild,v 1.2 2012/10/12 17:40:20 ago Exp $
EAPI=3
@@ -11,7 +11,7 @@ DOCS="TODO"
inherit php-ext-pecl-r2
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
DESCRIPTION="PHP wrapper for the ImageMagick library."
LICENSE="PHP-3.01"
View
1  dev-python/python-irclib/Manifest
@@ -1 +1,2 @@
+DIST irc-3.2.2.zip 84701 SHA256 b597ac3f0713386ba122f608a24e9f6fecd53ddac5ddb7889547ecab392ada1b SHA512 63a64626137617b14f401a6eb51a98b85db14db884faa9355b430df0f5fe8f9391139bb6e50fbbc985b5fd873844c8febe54685af679a847692175c366e8a6c7 WHIRLPOOL e6cc90191a242a2f1777b34550ffefafac0cb37890e593da29b61958a250eb93755e5d9301c6b5b727d42c0de74d2017884169024827cb3524f6ff21ecc3dcff
DIST python-irclib-0.4.8.tar.gz 34657 SHA256 81ee3a6401d4f4d1af1975913438a32fa453b4220bd2e509b7b5af4cbc29a4f4 SHA512 0cc5e01446ef230635647c4fcd729f8aab19e7a3485bdbb784bf4169b503af6a3069f3376fbd8349df87329f41ad5571885d7635d6760c3848fa07ec38c2749e WHIRLPOOL f17711b7e278f2ad30b78a7c1e7f58191360232b7ad8a2602cbbe86930744e0eb3677b403ab695bb318f932cdc0a0cf53e6d09beefdd1206799aeb41c4228d3b
View
36 dev-python/python-irclib/python-irclib-3.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-irclib/python-irclib-3.2.2.ebuild,v 1.1 2012/10/13 05:25:20 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="IRC client framework written in Python."
+HOMEPAGE="http://python-irclib.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/i/irc/irc-${PV}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="mirror"
+
+S="${WORKDIR}/irc-${PV}"
+
+src_install() {
+ distutils_src_install
+
+ if use doc; then
+ # Examples are treated like real documentation
+ insinto "/usr/share/doc/${PF}/examples"
+ doins dccreceive dccsend irccat irccat2 servermap testbot.py
+ fi
+}
View
4 dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.1 2012/07/20 05:48:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.2 2012/10/12 19:04:48 ago Exp $
EAPI=2
@@ -20,7 +20,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~x86 ~x86-macos"
IUSE=""
RUBY_PATCHES=( ${PN}-2.1.2-macaddress.patch )
View
4 dev-util/debhelper/debhelper-9.20120909.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-util/debhelper/debhelper-9.20120909.ebuild,v 1.5 2012/10/11 05:12:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120909.ebuild,v 1.6 2012/10/12 18:36:30 ago Exp $
EAPI=4
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="nls linguas_de linguas_es linguas_fr test"
RDEPEND="app-arch/dpkg
View
3  games-fps/urbanterror/urbanterror-4.2.002.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/games-fps/urbanterror/urbanterror-4.2.002.ebuild,v 1.1 2012/10/12 14:48:20 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.002.ebuild,v 1.2 2012/10/13 03:12:43 mr_bones_ Exp $
EAPI=4
@@ -82,7 +82,6 @@ src_install() {
insinto "${GAMES_DATADIR}"/${PN}/q3ut4
doins -r "${S_DATA}"/q3ut4/*.pk3
-
if use !dedicated ; then
newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
make_desktop_entry ${PN} "UrbanTerror"
View
4 media-libs/libextractor/libextractor-1.0.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/media-libs/libextractor/libextractor-1.0.0.ebuild,v 1.1 2012/10/02 12:03:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-1.0.0.ebuild,v 1.2 2012/10/12 22:51:49 blueness Exp $
EAPI=4
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg qt4 tidy tiff vorbis +zlib" # test
RESTRICT="test"
View
4 media-libs/libpng/libpng-1.2.50.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/media-libs/libpng/libpng-1.2.50.ebuild,v 1.3 2012/10/05 17:24:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.50.ebuild,v 1.4 2012/10/12 19:28:31 ago Exp $
# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="libpng"
SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="sys-libs/zlib
View
4 media-libs/libpng/libpng-1.5.13-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/media-libs/libpng/libpng-1.5.13-r1.ebuild,v 1.6 2012/10/11 23:14:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.13-r1.ebuild,v 1.7 2012/10/12 19:32:59 ago Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND="sys-libs/zlib"
View
2  media-libs/libsmf/Manifest
@@ -1 +1 @@
-DIST libsmf-1.3.tar.gz 545850 RMD160 c6c15191b3c1dff313a3a9f16e8050910c65ede9 SHA1 b2fb0ece095e77f04a9ff7532a88fe79533b2c47 SHA256 d3549f15de94ac8905ad365639ac6a2689cb1b51fdfa02d77fa6640001b18099
+DIST libsmf-1.3.tar.gz 545850 SHA256 d3549f15de94ac8905ad365639ac6a2689cb1b51fdfa02d77fa6640001b18099
View
4 media-libs/libsmf/libsmf-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsmf/libsmf-1.3.ebuild,v 1.4 2012/05/05 08:02:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsmf/libsmf-1.3.ebuild,v 1.5 2012/10/12 22:51:01 blueness Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc readline static-libs"
RDEPEND=">=dev-libs/glib-2.2:2
View
14 media-sound/teamspeak-server-bin/Manifest
@@ -1,6 +1,8 @@
-DIST teamspeak3-server_linux-amd64-3.0.0-beta30.tar.gz 3671039 RMD160 9ed4dc23b1c0b90577c8a340485519cb4ee0a9a5 SHA1 93a00072b0fcd04eba9fbd9e63f89d5a7afddd56 SHA256 244c1168a231c0739d5d53d0b065bb0da4dad13960b28bf49f42b69e40240fb1
-DIST teamspeak3-server_linux-amd64-3.0.0-rc1.tar.gz 3891707 RMD160 87027e5a23970b8b566a756fe7060c1f109f83d7 SHA1 4ce53d975e6ae2000fcd7c2c35b4f61d18b8ac61 SHA256 75c107b5b51a724b554f7445793e200e4748dd9f3708affef22cdd2ea8c5e218
-DIST teamspeak3-server_linux-amd64-3.0.5.tar.gz 4048053 RMD160 b34decad519bdfa7715c9f919e9d6f305c73da4e SHA1 1516c5f4391f294493e083a1846d269277949da3 SHA256 61f158d445262dc682676b17c86c36db2008b9e472401bd6409a6f8dde3d595a
-DIST teamspeak3-server_linux-x86-3.0.0-beta30.tar.gz 3980738 RMD160 eafcf121349ccd1a35db1cb9d1b0fba3d81d34ce SHA1 c61eefc7a4b7cded9a8eaf38692a5238cb2e8f29 SHA256 a0721f99bf4158615ab9346fe65f5e9dba61fb93be1333195d9e0c8bd64eef2a
-DIST teamspeak3-server_linux-x86-3.0.0-rc1.tar.gz 4198820 RMD160 09d29d2742a9e353eba5310443b234fd3d4fa995 SHA1 56fb884d85496d6542654172fe88336b150f8ccd SHA256 54dda1a42f1909f031fd875777854b3bdeca88a17ae55f88a6235d794021327b
-DIST teamspeak3-server_linux-x86-3.0.5.tar.gz 4359085 RMD160 f3af36331aedca1191cb0b9c3df2da8fc4604a41 SHA1 49fded7dc29c0c3d36949f06a8e7a6d76992cecf SHA256 e5fcb986412921828d7338f5faf3910bdd3e9c4bbd6a0a9d93d5637e77ad0eff
+DIST teamspeak3-server_linux-amd64-3.0.0-beta30.tar.gz 3671039 SHA256 244c1168a231c0739d5d53d0b065bb0da4dad13960b28bf49f42b69e40240fb1
+DIST teamspeak3-server_linux-amd64-3.0.0-rc1.tar.gz 3891707 SHA256 75c107b5b51a724b554f7445793e200e4748dd9f3708affef22cdd2ea8c5e218
+DIST teamspeak3-server_linux-amd64-3.0.5.tar.gz 4048053 SHA256 61f158d445262dc682676b17c86c36db2008b9e472401bd6409a6f8dde3d595a SHA512 ea5c5cb947bae1afbdb3fa67e71910825beb05818460298bdbc8232ece594abd3282ceba3b11cfe0a79e431e0bc66335cbe1e41d8f3cc1afa6750ae3ed2d508b WHIRLPOOL 41c6118c7a0afba3880333f3d93593a0b65b565356650634bc7c529cccf0f18d0d160abdb6b728e05f7a78e40a7db436dd299ed551b51a15ef7a9115f00a9a62
+DIST teamspeak3-server_linux-amd64-3.0.6.1.tar.gz 4131518 SHA256 5d222d1f6b28db856788e0004a1a2143372c82fecbd0651e8a575cee8742ef3c SHA512 e5700fea5bf4df2134449cf3a57a823feb4bf72e052bec242fe4d180563a44cf48acd3d46f3ac2ec1a9c300ab903ff132cb16e06501cbac4650993240656414b WHIRLPOOL 4ba2a6f4561365c1441c7bec861b057e8d66d5ea9f08f05e472c2ed70ceedec5898b149e9cb208d0cdea7ccccde97acda0de9e412c5e86cc8a25ff3a25b12ee2
+DIST teamspeak3-server_linux-x86-3.0.0-beta30.tar.gz 3980738 SHA256 a0721f99bf4158615ab9346fe65f5e9dba61fb93be1333195d9e0c8bd64eef2a
+DIST teamspeak3-server_linux-x86-3.0.0-rc1.tar.gz 4198820 SHA256 54dda1a42f1909f031fd875777854b3bdeca88a17ae55f88a6235d794021327b
+DIST teamspeak3-server_linux-x86-3.0.5.tar.gz 4359085 SHA256 e5fcb986412921828d7338f5faf3910bdd3e9c4bbd6a0a9d93d5637e77ad0eff
+DIST teamspeak3-server_linux-x86-3.0.6.1.tar.gz 4436951 SHA256 ea0399bfce623b09e15dca4fc970528ae7b4cee27027ff2ab03a1563da562f0c SHA512 5e022bcb8b3c0b8c728c2ea85421908c86f9e41ea87c172a246fd749b04182467cfdaba8d53413b76c6dbbf97d598564e533245f2530f6375c5cd35465c2f850 WHIRLPOOL a4fa70b534bd3370cda50de7f462126db2d0a34bbe4fa5fcae3c226d277f03bc30d8af09d3909c79f005decc68b5f8c15517fc9e7a485d8c9807ca83082402d1
View
56 media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild,v 1.1 2012/10/12 21:23:01 trapni Exp $
+
+EAPI=4
+
+inherit eutils systemd user
+
+DESCRIPTION="TeamSpeak Server - Voice Communication Software"
+HOMEPAGE="http://teamspeak.com/"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+SRC_URI="
+ amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
+ x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )
+"
+
+S="${WORKDIR}/teamspeak3-server_linux-${ARCH}"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewuser teamspeak3
+}
+
+src_install() {
+ local dest="${D}/opt/teamspeak3-server"
+
+ mkdir -p "${dest}"
+ cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die
+
+ mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die
+
+ exeinto /usr/sbin || die
+ doexe "${FILESDIR}/ts3server" || die
+
+ # runtime FS layout ...
+ insinto /etc/teamspeak3-server
+ doins "${FILESDIR}/server.conf"
+ newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
+
+ keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
+ fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
+ fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+
+ fowners teamspeak3 /opt/teamspeak3-server
+ fperms 755 /opt/teamspeak3-server
+
+ systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
+ systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+}
View
2  metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Oct 2012 17:37:00 +0000
+Sat, 13 Oct 2012 05:37:00 +0000
View
2  metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Oct 2012 17:37:00 +0000
+Sat, 13 Oct 2012 05:37:00 +0000
View
14 metadata/md5-cache/app-dicts/gjiten-2.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libglade-2 app-text/rarian dev-util/intltool app-text/xmlto app-text/docbook-xml-dtd:4.1.2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DESCRIPTION=A Japanese dictionary program for Gnome
+EAPI=2
+HOMEPAGE=http://gjiten.sourceforge.net/
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libglade-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://gjiten.sourceforge.net/gjiten-2.6.tar.gz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils 5a98daf52f7430a4a6f46cee24cfe3e2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 5914ad8783dd6ac6bc358d730bf4c411 gnome2-utils ce6efa755297a17906d9d8e1a1b79837 libtool 2b273eea1976cfaed3449345d94331ac multilib c2b85b5c63a44798c1e442147ac14c5c multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=18621253c625fc1d03d5f9bbb0a1309c
View
6 metadata/md5-cache/app-emulation/libvirt-0.10.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst postrm preinst prepare setup test