diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-05 15:24:15 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-05 15:24:15 +0000 |
commit | 5de5db60143c7c8f29ac2552b519021c6b51cf4d (patch) | |
tree | fbc72a82bd7c45a5e0eb0742d52d10b1722ba1d4 /app-emulation/wine | |
parent | Add missing patch (diff) | |
download | historical-5de5db60143c7c8f29ac2552b519021c6b51cf4d.tar.gz historical-5de5db60143c7c8f29ac2552b519021c6b51cf4d.tar.bz2 historical-5de5db60143c7c8f29ac2552b519021c6b51cf4d.zip |
Starting with 1.5.23, SSL/TLS support requires both gnutls (for secur32.dll and winhttp.dll) and openssl (for wininet.dll); thanks to Jan Psota for noticing. Remove broken 1.5.23.ebuild.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/wine/Manifest | 21 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.5.23-r1.ebuild | 11 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.5.23.ebuild | 285 | ||||
-rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 11 |
5 files changed, 29 insertions, 307 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index e40cbeef5d90..72e21c172d3a 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.450 2013/02/04 02:38:40 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.451 2013/02/05 15:24:10 tetromino Exp $ + + 05 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -wine-1.5.23.ebuild, + wine-1.5.23-r1.ebuild, wine-9999.ebuild: + Starting with 1.5.23, SSL/TLS support requires both gnutls (for secur32.dll + and winhttp.dll) and openssl (for wininet.dll); thanks to Jan Psota for + noticing. Remove broken 1.5.23.ebuild. *wine-1.5.23-r1 (04 Feb 2013) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 5578e09a42b7..fd258550270b 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -86,8 +86,7 @@ EBUILD wine-1.5.2.ebuild 6385 SHA256 bb1f7d43a9ca8e8da360046a8da4a1fede2c7c928a8 EBUILD wine-1.5.20.ebuild 8019 SHA256 a606a3b18bf3709ca5d80c78a46680f7257e3f7644e4eb211f4e3e4467051cfb SHA512 a203d965867c9bd4ff8d6867af4959c7242da29dd3eff3f5cb6391221de8892b57c6f4794864ff6c724c5481f3438b241f50470ec727f81fd7002bdd070935a1 WHIRLPOOL 52b731780c3c599177547cf5351af275e9fb72a4e6b0fbf6a56032dc2fe54cd4a1251728f31045f45286768615d17a3fb045ab216f93355236dd5516010a37f7 EBUILD wine-1.5.21.ebuild 8007 SHA256 4fd76dc3dd874af438e909699306e6dbe61213b1081a30e133baf2b7e4287880 SHA512 2f39a52b9a508b5e680448caa4b632a0dc7f3c71e5cfafc78d2975ebec9f6bc96158403bcbb860e57257d43c2a6b9087393462da82f9c827809959b22d03caa2 WHIRLPOOL edf65255b8685fa8160bd9346a16e55528943966209186fe0d2c97dcb709fc93d85cf810c452e599d6ea40bb80c7c08d1fa1f8d69bf3d1074a72db49a62d14af EBUILD wine-1.5.22.ebuild 8007 SHA256 ec3515b8425cafeb32cec889d5794af6bd1ab4969e574ae5ec348ad6bbadc174 SHA512 ac539e24a88e38707e26e8499b7c2809434656daa96f6bfb0c5c46881eae3c57f418e00ff450044dfaa232cc1fedf77ea7fe38703be269d420b6f553470be29c WHIRLPOOL 5873a2f646ac493d438739bf4d5cf2f1369780ef9c3d37ec6482098fa358c024668b2cd3b98a144d79b7006d19f1edd98e4f359ee44b9774a0a81e7f3e26088c -EBUILD wine-1.5.23-r1.ebuild 8113 SHA256 aa55c905f87f30721d68a8a8b9b14b827fd5456a3a54692a0fdf6f00ab05917b SHA512 cf68702544a2057f13e472efceb8c51ad7d05f530eebe5eca5d3dea9cbc2793a1edd4356d60231697eebdb5245c30d2d63cc672ced552492d2dc1d4f9ee83c3b WHIRLPOOL a4e325efcc864a0f9ef18b9b07ce5ad0a15af45340bcc7c77f3a692d543dba631156dbcca3f6c89fc8d53e940a621d5a29d26e6d3fc135213f5ba3a38e70b3f3 -EBUILD wine-1.5.23.ebuild 8007 SHA256 18d701088e09d549a7492ff14794022cbeeafe4ea7a862ff6b07906527bb6869 SHA512 cfbb44822315c64a0011f0966df27a5323fdea224c2842e396a09c1bbe4cfb7e47a3bbddccb08a721f1ada9a5164aca4a6e64b554372ca69d6f262f04b55705a WHIRLPOOL d04b34d3b3a781b6b4ce10e3f726910d8ee99ae3618ae1c4c7a83a4098d5f794a5fe426820b7616f12dd3f4d58d4a456c95c8d27e2432804dcbb9b5dfdc0bcf0 +EBUILD wine-1.5.23-r1.ebuild 8101 SHA256 8ee23a103f710978892b03ea764ddcad3c0692831887a58f557576bdc9cbec1a SHA512 4a9bf5a6b7fdefe0b6165c9fdf3d8582df1e3e8838b82b03bc4e52c216bc5e06cbd08cdac9fe12cba6ea585a4ea1b43732cc79ecafaf551c50c9e1022bc3c8b2 WHIRLPOOL 2703c8e74c6364fd2b3cc0cd3712ca35af39b2e56c3610d73ecfbe98ba12eae54b615aca912f612b2a15dcfeb97ac83a301f4e6eb9ca05dc98a9b58b771d73e2 EBUILD wine-1.5.3.ebuild 6385 SHA256 80c5a8c0a390c5e1676b7c0458a9e96631e57e7733fce5e5d9fd3c8694d778b5 SHA512 9154d918c65cdc973ab6ff956f70d8069c026126013313f0d6865d9dee0ff2282db1196493d2f8aeaabd0bb4b220017e80a6f239e3ca3bf9f4d368fab6795c46 WHIRLPOOL 9097656a9940331808440dfcbb48c5f5735b9a8b2173906a6c29b4c10a5fa7a7d579966447b2d76cfa6cc9e27355bab3266aa38839f7b38007b93923d587dbb3 EBUILD wine-1.5.4.ebuild 6385 SHA256 b858e0aae1f76726a338d2b4754c829416d5f709aaa6565930ba58b0927b2021 SHA512 6757b1c4e738201861af63afd1f7e1920068bcefbbc4b27d2738f93e363cceef38f5806dabf349563261a755264c65cfc2bd4ff00a5cedb8951645759e36812c WHIRLPOOL f8c00af6e3b94553bd989ca4e6d0304c8a57284d6691cd13546f3275c719f65462c7a207b0345a1ac5becddaba68b16a094b4463f8f0c5528ad2928501c47eec EBUILD wine-1.5.5.ebuild 6385 SHA256 9c904c72aa65b0d5b88bd156fe0a0a11241dd79bf8efe64d14f662351d022922 SHA512 e9008d1c3880304b5de4209138bc0180d3dbd462548aa7d4e462e66ac0a3b2793b4deb77f39855440e103d9ea9ad8d4493869aa70742f0f856b87a173bec751f WHIRLPOOL 5538cd92f06ddad637de46bbb28fffb3de42d77eead310d7cdedd2e6a11b5cc968f9d6be97855bd79e228c2ac6019cb3b4e8b8a1f2d645f16e47cbd901e08046 @@ -95,18 +94,18 @@ EBUILD wine-1.5.6.ebuild 6605 SHA256 89bb5d1c80780c2015f246195a3d1dc52ac84e194ca EBUILD wine-1.5.7.ebuild 6853 SHA256 eb4e0bb4f1932685c7fb91ea08cc4d0f116bc137155bc66c521581e40f1fd207 SHA512 8f80e298b45addec8e1054da647e76c10eeb1ed89545343d45470628650f9f6257086555c681e71fbdeca794630fbf74dab562030448885d5a2794f1232d2d96 WHIRLPOOL ae6637106e12d7c494af047bf889d31e82fec3dfc7573163a7c828c64121b060684ad05a5f9d5dc8bf82823b2d1d0f17465b1dcbb305b8bf556bc59ce4c48d28 EBUILD wine-1.5.8.ebuild 6853 SHA256 b4bfb67e1245c06c2569c5ff2824cd1e94a18736f3dd5eb8757a9cf46932ee0d SHA512 b073a3149056e958cfc47580341e6849c93674bd48e7f0ab94fe5c2f28978ee554e8613c6de1c131e82c133d97a8bcfce46558754bbd4ee40377bced5d19f132 WHIRLPOOL f83e2e736857ff5f06c83956a3339ad842ab8d22f3094d7911e817235128d5307751d86f9ea49babd1b6299fbe726750ee8f6a497b59cd4971b79780913f3437 EBUILD wine-1.5.9.ebuild 6853 SHA256 a9d570b694ec03450b0e0b7aaad8f5b6224c5ffddf5c54b1907bdfd3de4631d8 SHA512 eccbb58860ef6cabff4d43b1133eb128bb12add39dcc5a71198bde41be971300db80df3e6a4f7c2d82512ee3e55481042dfd91ac514e5a6ecd7eb47bfe43396b WHIRLPOOL 1c0dca8e7c9b0cf224f0857c858f66d3f9853677b5cf68522e9ed64143e5083d38432f91150a3e826328ec95e11c5ade1dbd5cedee8e2b0933e7828b1f31b1bd -EBUILD wine-9999.ebuild 8110 SHA256 752e2b7a14efe6331b72a4f90476765f6979874e229bd522ee8f135605ad2b8a SHA512 401715338be3b8b93730462ddcef33b9b1d04a033c3d7ab33d9713d2536524482cc86c1ac17ab050323a0fc39ca64e8d17cdbebdd956e0120ab9d965f59f7b51 WHIRLPOOL 0db472095b94eb7e35a6b3a06bfd2d816f5e4999595ddfbb8aeebe6a900b3405981947ec0d2a0df213c2f2e34b6d869bc309c7b987e1225ff67688dfb79e081f -MISC ChangeLog 1495 SHA256 4bd5d93b63e03b95a4091f3b7bc0a02e89864ff0c0457f9e60ffcae33ae8c5fe SHA512 9aa1bfadb9f5e5bd0108e10e19d1b68e9e22a3fbc5db306c26d53e94d94e73daa6cd901bcc760b141376d8f619b4bb4942a1d774c99093b5581cdbe3ea0a8042 WHIRLPOOL 10e99a02ea18d87350862fa942cc5d787c6cf086144add15aa5547665246539ef895021dd622056a2ec69df35e4770defafff9a748f7c3f91e638569965e88fb +EBUILD wine-9999.ebuild 8098 SHA256 e3eb815342f0834b99b194b27e8b2424085cda8c51ff9dcc1ab4a5ee38a87bcf SHA512 9a26c41b9a796e98891f98f38ca9d4f98dc2d4b77a44adab8ada46cec34b525b771a31cee2aa01d92d332c54e082f426b793b2f08212554bcb9479223c834c8e WHIRLPOOL 2bd8ca117375f536ad7839dbb368069ad0635ee5a6c7ab0003e88908dbc6f91f877c245f8b8b08f4485d5b7cb383deaf41de802950c645676181d41ad2fbb1fb +MISC ChangeLog 1812 SHA256 2f0bd559d2467eafd8f0e173bcb56f5b00a337b9bb20d3c11b77e78b255a4cfc SHA512 8976bff07364df68210efb5347f3ceb087d9f14b8ed00d9fcdc2a3016eb2bef9f2f1f154a935d2b5b5ee3d11505970fd6501d7b7a2c367f64c61492cddefc1ae WHIRLPOOL 9942dc00b0f55751f16501ee10b3f1bc4b3538861c69ae93545f64fd9905d1cb6b47aed0506b094a239f6a20e7dd814d2c7ad6266fc57c7f040ec4bdc5923d57 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014 MISC metadata.xml 1857 SHA256 8a16a223604fe47d86a35f79912e60aa419c467dd050ae21d96ea45d615f92ea SHA512 279a5169d2ab779ad41889f8d6b24e8d2de7bba3a611470d5d9cb6c5f27930d336de07bd2431ae9a0c9065887456c150fb2e3582201280945f8fb1520e0a3a3e WHIRLPOOL 1797da0945b3134c72ed15da155a26b24431f35051bc729edec9466a2db73a49a1919993a562e23c8315c362f10a43b3d26fd9fbec205518fadbf9b6324172d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRDx8yAAoJEJ0WA1zPCt1hxq0H/3PqzVHuq1bOVPZXPU/EaZZJ -BOEqY8I003MTtqYl90mC+Wad/lT+/aBB0qm9rp9YvAzMiuM20mq0DlCzEh/CTa2Q -N9ASQBMzwxqgVXXte9+a52rfnJ7encabVRKHP43q/PkCMq6zH0My/b4IKoVm/ELc -/BZxNdE63RtWQx1MhNtq00I/UIwP5gMcLxobomYsTi4d8+W6Xz+zY6FaSa3slRax -+Lhi3SEcpBUVaJaNe896UxV6sEW6Ze91NfZuOjPsxSUpqJioWyzVbIH4x8B3JeKI -knCh67wOwdtkL+8crpKPIvnlBHX8f0+HdrviSADWm+qEegcbLnqWfLzSjCeRRis= -=Na9L +iQEcBAEBCAAGBQJRESQbAAoJEJ0WA1zPCt1hibAIALKyabhnTxlF17TttQ29O1zn +o2DXn1EvT5xIkIZr7xi2rMuvkZJATbo6qGy90bfYLjjDkB+04YLIbdSwaw5dnpRO +fUIpyl1ki/clVCIzDSyW+q3m0swC9yiIhkDDM+05uok+8YV+pbV47rZZXGspVruk +eL8zuq14zHJpYiJzqINrMD7yLh2HJwcbAJvESnyQaYkzOzR4Vr/3o3XNzm5whQl2 +3tkuQgztEICXEpczcr6g5cIbCTlF7OZhiAUH8JD1TlHPFWKre3cR+963zvxQGJ1N +WMjt3A32qqRosaubAZ7pIwwCIjlzMJCZ5zuuFXEz3nefZ7Z3OZiu2Nr3Y//cR2Y= +=3HPF -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-1.5.23-r1.ebuild b/app-emulation/wine/wine-1.5.23-r1.ebuild index 41ea5f36d07d..2ffbffca8869 100644 --- a/app-emulation/wine/wine-1.5.23-r1.ebuild +++ b/app-emulation/wine/wine-1.5.23-r1.ebuild @@ -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.23-r1.ebuild,v 1.1 2013/02/04 02:38:40 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.2 2013/02/05 15:24:10 tetromino Exp $ EAPI="5" @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink 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 gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" [[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio" REQUIRED_USE="elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) @@ -69,7 +69,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) sys-apps/dbus sys-fs/udisks:2 ) - gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor @@ -99,7 +98,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) - ssl? ( dev-libs/openssl:= ) + ssl? ( + dev-libs/openssl:= + net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( ${MLIB_DEPS} ) @@ -185,7 +186,7 @@ do_configure() { $(use_with ncurses curses) \ $(use_with udisks dbus) \ $(use_with fontconfig) \ - $(use_with gnutls) \ + $(use_with ssl gnutls) \ $(use_with gphoto2 gphoto) \ $(use_with gsm) \ $(use_with gstreamer) \ diff --git a/app-emulation/wine/wine-1.5.23.ebuild b/app-emulation/wine/wine-1.5.23.ebuild deleted file mode 100644 index 38d7542fe700..000000000000 --- a/app-emulation/wine/wine-1.5.23.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# 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.23.ebuild,v 1.1 2013/02/03 00:52:52 tetromino Exp $ - -EAPI="5" - -inherit autotools eutils flag-o-matic gnome2-utils 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.9" -MV="0.0.8" -PULSE_PATCHES="winepulse-patches-1.5.23" -WINE_GENTOO="wine-gentoo-2012.11.24" -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 - http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" -[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio" -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 - ) - 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 ) - osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 ) - 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:0.10 media-libs/gst-plugins-base:0.10 ) - 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:0= ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - odbc? ( dev-db/unixODBC:= ) - osmesa? ( media-libs/mesa[osmesa] ) - 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 )" -[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND} - pulseaudio? ( - media-sound/pulseaudio - sys-auth/rtkit - )" -DEPEND="${RDEPEND} - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - xinerama? ( x11-proto/xineramaproto ) - prelink? ( sys-devel/prelink ) - virtual/pkgconfig - virtual/yacc - sys-devel/flex" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -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" - unpack "${WINE_GENTOO}.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.17-osmesa-check.patch #429386 - [[ ${PV} == "9999" ]] || 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 - - local usepulse - [[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse) - - 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) \ - $(use_with osmesa) \ - $(use_with oss) \ - $(use_with png) \ - $(use_with threads pthread) \ - ${usepulse} \ - $(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 - emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" - 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 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index fd02d5b7bfcf..c242d52f0ef3 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -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-9999.ebuild,v 1.131 2013/02/04 02:38:40 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.132 2013/02/05 15:24:10 tetromino Exp $ EAPI="5" @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink 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 gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" [[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio" REQUIRED_USE="elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) ) @@ -69,7 +69,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) sys-apps/dbus sys-fs/udisks:2 ) - gnutls? ( net-libs/gnutls:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor @@ -99,7 +98,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) - ssl? ( dev-libs/openssl:= ) + ssl? ( + dev-libs/openssl:= + net-libs/gnutls:= ) png? ( media-libs/libpng:= ) v4l? ( media-libs/libv4l ) !win64? ( ${MLIB_DEPS} ) @@ -185,7 +186,7 @@ do_configure() { $(use_with ncurses curses) \ $(use_with udisks dbus) \ $(use_with fontconfig) \ - $(use_with gnutls) \ + $(use_with ssl gnutls) \ $(use_with gphoto2 gphoto) \ $(use_with gsm) \ $(use_with gstreamer) \ |