| 1 |
tetromino 13/06/30 02:27:50 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: wine-1.6_rc4.ebuild |
| 5 |
Removed: wine-1.6_rc2.ebuild wine-1.6_rc1.ebuild |
| 6 |
Log: |
| 7 |
Version bump, see http://www.winehq.org/announce/1.6-rc4 for the announcement. Remove old RCs. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.470 app-emulation/wine/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.470&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.470&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.469&r2=1.470 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v |
| 21 |
retrieving revision 1.469 |
| 22 |
retrieving revision 1.470 |
| 23 |
diff -u -r1.469 -r1.470 |
| 24 |
--- ChangeLog 24 Jun 2013 04:16:41 -0000 1.469 |
| 25 |
+++ ChangeLog 30 Jun 2013 02:27:50 -0000 1.470 |
| 26 |
@@ -1,6 +1,14 @@ |
| 27 |
# ChangeLog for app-emulation/wine |
| 28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.469 2013/06/24 04:16:41 tetromino Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.470 2013/06/30 02:27:50 tetromino Exp $ |
| 31 |
+ |
| 32 |
+*wine-1.6_rc4 (30 Jun 2013) |
| 33 |
+ |
| 34 |
+ 30 Jun 2013; Alexandre Rostovtsev <tetromino@g.o> |
| 35 |
+ -wine-1.6_rc1.ebuild, -wine-1.6_rc2.ebuild, +wine-1.6_rc4.ebuild, |
| 36 |
+ -files/wine-1.6_rc1-pkg-config.patch: |
| 37 |
+ Version bump, see http://www.winehq.org/announce/1.6-rc4 for the |
| 38 |
+ announcement. Remove old RCs. |
| 39 |
|
| 40 |
*wine-1.6_rc3 (24 Jun 2013) |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 app-emulation/wine/wine-1.6_rc4.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6_rc4.ebuild?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6_rc4.ebuild?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: wine-1.6_rc4.ebuild |
| 51 |
=================================================================== |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6_rc4.ebuild,v 1.1 2013/06/30 02:27:50 tetromino Exp $ |
| 55 |
|
| 56 |
EAPI="5" |
| 57 |
|
| 58 |
AUTOTOOLS_AUTORECONF=1 |
| 59 |
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" |
| 60 |
PLOCALE_BACKUP="en" |
| 61 |
|
| 62 |
inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx |
| 63 |
|
| 64 |
if [[ ${PV} == "9999" ]] ; then |
| 65 |
EGIT_REPO_URI="git://source.winehq.org/git/wine.git" |
| 66 |
inherit git-2 |
| 67 |
SRC_URI="" |
| 68 |
#KEYWORDS="" |
| 69 |
else |
| 70 |
MY_P="${PN}-${PV/_/-}" |
| 71 |
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" |
| 72 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 73 |
S=${WORKDIR}/${MY_P} |
| 74 |
fi |
| 75 |
|
| 76 |
GV="2.21" |
| 77 |
MV="0.0.8" |
| 78 |
PULSE_PATCHES="winepulse-patches-1.6-rc1" |
| 79 |
WINE_GENTOO="wine-gentoo-2013.06.24" |
| 80 |
DESCRIPTION="Free implementation of Windows(tm) on Unix" |
| 81 |
HOMEPAGE="http://www.winehq.org/" |
| 82 |
SRC_URI="${SRC_URI} |
| 83 |
gecko? ( |
| 84 |
abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) |
| 85 |
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) |
| 86 |
) |
| 87 |
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) |
| 88 |
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 |
| 89 |
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" |
| 90 |
|
| 91 |
LICENSE="LGPL-2.1" |
| 92 |
SLOT="0" |
| 93 |
IUSE="+abi_x86_32 +abi_x86_64 +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 +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" |
| 94 |
[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio" |
| 95 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 96 |
test? ( abi_x86_32 ) |
| 97 |
elibc_glibc? ( threads ) |
| 98 |
mono? ( abi_x86_32 ) |
| 99 |
osmesa? ( opengl )" #286560 |
| 100 |
|
| 101 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
| 102 |
# or fail due to Xvfb's opengl limitations. |
| 103 |
RESTRICT="test" |
| 104 |
|
| 105 |
RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) |
| 106 |
perl? ( dev-lang/perl dev-perl/XML-Simple ) |
| 107 |
capi? ( net-dialup/capi4k-utils ) |
| 108 |
ncurses? ( >=sys-libs/ncurses-5.2:= ) |
| 109 |
fontconfig? ( media-libs/fontconfig:= ) |
| 110 |
gphoto2? ( media-libs/libgphoto2:= ) |
| 111 |
openal? ( media-libs/openal:= ) |
| 112 |
udisks? ( |
| 113 |
sys-apps/dbus |
| 114 |
sys-fs/udisks:2 |
| 115 |
) |
| 116 |
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) |
| 117 |
X? ( |
| 118 |
x11-libs/libXcursor |
| 119 |
x11-libs/libXext |
| 120 |
x11-libs/libXrandr |
| 121 |
x11-libs/libXi |
| 122 |
x11-libs/libXmu |
| 123 |
x11-libs/libXxf86vm |
| 124 |
) |
| 125 |
xinerama? ( x11-libs/libXinerama ) |
| 126 |
alsa? ( media-libs/alsa-lib ) |
| 127 |
cups? ( net-print/cups:= ) |
| 128 |
opencl? ( virtual/opencl ) |
| 129 |
opengl? ( |
| 130 |
virtual/glu |
| 131 |
virtual/opengl |
| 132 |
) |
| 133 |
gsm? ( media-sound/gsm:= ) |
| 134 |
jpeg? ( virtual/jpeg:= ) |
| 135 |
ldap? ( net-nds/openldap:= ) |
| 136 |
lcms? ( media-libs/lcms:0= ) |
| 137 |
mp3? ( >=media-sound/mpg123-1.5.0 ) |
| 138 |
nls? ( sys-devel/gettext ) |
| 139 |
odbc? ( dev-db/unixODBC:= ) |
| 140 |
osmesa? ( media-libs/mesa[osmesa] ) |
| 141 |
samba? ( >=net-fs/samba-3.0.25 ) |
| 142 |
selinux? ( sec-policy/selinux-wine ) |
| 143 |
xml? ( dev-libs/libxml2 dev-libs/libxslt ) |
| 144 |
scanner? ( media-gfx/sane-backends:= ) |
| 145 |
ssl? ( net-libs/gnutls:= ) |
| 146 |
png? ( media-libs/libpng:0= ) |
| 147 |
v4l? ( media-libs/libv4l ) |
| 148 |
xcomposite? ( x11-libs/libXcomposite ) |
| 149 |
amd64? ( |
| 150 |
abi_x86_32? ( |
| 151 |
gstreamer? ( |
| 152 |
app-emulation/emul-linux-x86-gstplugins |
| 153 |
app-emulation/emul-linux-x86-medialibs[development] |
| 154 |
) |
| 155 |
truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) |
| 156 |
X? ( |
| 157 |
>=app-emulation/emul-linux-x86-xlibs-2.1[development] |
| 158 |
>=app-emulation/emul-linux-x86-soundlibs-2.1[development] |
| 159 |
) |
| 160 |
mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) |
| 161 |
odbc? ( app-emulation/emul-linux-x86-db[development] ) |
| 162 |
openal? ( app-emulation/emul-linux-x86-sdl[development] ) |
| 163 |
opengl? ( app-emulation/emul-linux-x86-opengl[development] ) |
| 164 |
osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) |
| 165 |
scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) |
| 166 |
v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) |
| 167 |
>=app-emulation/emul-linux-x86-baselibs-20130224[development] |
| 168 |
>=sys-kernel/linux-headers-2.6 |
| 169 |
) |
| 170 |
)" |
| 171 |
[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND} |
| 172 |
pulseaudio? ( |
| 173 |
media-sound/pulseaudio |
| 174 |
sys-auth/rtkit |
| 175 |
)" |
| 176 |
DEPEND="${RDEPEND} |
| 177 |
X? ( |
| 178 |
x11-proto/inputproto |
| 179 |
x11-proto/xextproto |
| 180 |
x11-proto/xf86vidmodeproto |
| 181 |
) |
| 182 |
xinerama? ( x11-proto/xineramaproto ) |
| 183 |
prelink? ( sys-devel/prelink ) |
| 184 |
virtual/pkgconfig |
| 185 |
virtual/yacc |
| 186 |
sys-devel/flex" |
| 187 |
|
| 188 |
# These use a non-standard "Wine" category, which is provided by |
| 189 |
# /etc/xdg/applications-merged/wine.menu |
| 190 |
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop |
| 191 |
usr/share/applications/wine-notepad.desktop |
| 192 |
usr/share/applications/wine-uninstaller.desktop |
| 193 |
usr/share/applications/wine-winecfg.desktop" |
| 194 |
|
| 195 |
src_unpack() { |
| 196 |
if use abi_x86_64; then |
| 197 |
[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \ |
| 198 |
&& die "you need gcc-4.4+ to build 64bit wine" |
| 199 |
fi |
| 200 |
|
| 201 |
if use abi_x86_32 && use opencl; then |
| 202 |
[[ x$(eselect opencl show) = "xintel" ]] && |
| 203 |
die "Cannot build wine[opencl,abi_x86_32]: intel-ocl-sdk is 64-bit only" # 403947 |
| 204 |
fi |
| 205 |
|
| 206 |
if [[ ${PV} == "9999" ]] ; then |
| 207 |
git-2_src_unpack |
| 208 |
else |
| 209 |
unpack ${MY_P}.tar.bz2 |
| 210 |
fi |
| 211 |
|
| 212 |
unpack "${PULSE_PATCHES}.tar.bz2" |
| 213 |
unpack "${WINE_GENTOO}.tar.bz2" |
| 214 |
|
| 215 |
l10n_find_plocales_changes "${S}/po" "" ".po" |
| 216 |
} |
| 217 |
|
| 218 |
src_prepare() { |
| 219 |
local md5="$(md5sum server/protocol.def)" |
| 220 |
local PATCHES=( |
| 221 |
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 |
| 222 |
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 |
| 223 |
"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386 |
| 224 |
) |
| 225 |
[[ ${PV} == "9999" ]] || PATCHES+=( |
| 226 |
"../${PULSE_PATCHES}"/*.patch #421365 |
| 227 |
) |
| 228 |
|
| 229 |
autotools-utils_src_prepare |
| 230 |
|
| 231 |
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then |
| 232 |
einfo "server/protocol.def was patched; running tools/make_requests" |
| 233 |
tools/make_requests || die #432348 |
| 234 |
fi |
| 235 |
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die |
| 236 |
if ! use run-exes; then |
| 237 |
sed -i '/^MimeType/d' tools/wine.desktop || die #117785 |
| 238 |
fi |
| 239 |
|
| 240 |
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
| 241 |
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die |
| 242 |
|
| 243 |
l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS |
| 244 |
} |
| 245 |
|
| 246 |
do_configure() { |
| 247 |
local myeconfargs=( "${myeconfargs[@]}" ) |
| 248 |
|
| 249 |
if use amd64; then |
| 250 |
if [[ ${ABI} == amd64 ]]; then |
| 251 |
myeconfargs+=( --enable-win64 ) |
| 252 |
else |
| 253 |
myeconfargs+=( --disable-win64 ) |
| 254 |
fi |
| 255 |
|
| 256 |
# Note: using --with-wine64 results in problems with multilib.eclass |
| 257 |
# CC/LD hackery. We're using separate tools instead. |
| 258 |
fi |
| 259 |
|
| 260 |
autotools-utils_src_configure |
| 261 |
} |
| 262 |
|
| 263 |
src_configure() { |
| 264 |
export LDCONFIG=/bin/true |
| 265 |
use custom-cflags || strip-flags |
| 266 |
|
| 267 |
local myeconfargs=( # common |
| 268 |
--sysconfdir=/etc/wine |
| 269 |
$(use_with alsa) |
| 270 |
$(use_with capi) |
| 271 |
$(use_with lcms cms) |
| 272 |
$(use_with cups) |
| 273 |
$(use_with ncurses curses) |
| 274 |
$(use_with udisks dbus) |
| 275 |
$(use_with fontconfig) |
| 276 |
$(use_with ssl gnutls) |
| 277 |
$(use_with gphoto2 gphoto) |
| 278 |
$(use_with gsm) |
| 279 |
$(use_with gstreamer) |
| 280 |
--without-hal |
| 281 |
$(use_with jpeg) |
| 282 |
$(use_with ldap) |
| 283 |
$(use_with mp3 mpg123) |
| 284 |
$(use_with nls gettext) |
| 285 |
$(use_with openal) |
| 286 |
$(use_with opencl) |
| 287 |
$(use_with opengl) |
| 288 |
$(use_with osmesa) |
| 289 |
$(use_with oss) |
| 290 |
$(use_with png) |
| 291 |
$(use_with threads pthread) |
| 292 |
$(use_with scanner sane) |
| 293 |
$(use_enable test tests) |
| 294 |
$(use_with truetype freetype) |
| 295 |
$(use_with v4l) |
| 296 |
$(use_with X x) |
| 297 |
$(use_with xcomposite) |
| 298 |
$(use_with xinerama) |
| 299 |
$(use_with xml) |
| 300 |
$(use_with xml xslt) |
| 301 |
) |
| 302 |
|
| 303 |
[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) ) |
| 304 |
|
| 305 |
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 |
| 306 |
use amd64 && use abi_x86_32 && tc-export PKG_CONFIG |
| 307 |
|
| 308 |
multilib_parallel_foreach_abi do_configure |
| 309 |
} |
| 310 |
|
| 311 |
src_compile() { |
| 312 |
autotools-multilib_src_compile depend |
| 313 |
autotools-multilib_src_compile all |
| 314 |
} |
| 315 |
|
| 316 |
src_test() { |
| 317 |
if [[ $(id -u) == 0 ]]; then |
| 318 |
ewarn "Skipping tests since they cannot be run under the root user." |
| 319 |
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf" |
| 320 |
return |
| 321 |
fi |
| 322 |
|
| 323 |
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" |
| 324 |
multilib_toolchain_setup x86 |
| 325 |
local BUILD_DIR="${S}-${ABI}" |
| 326 |
cd "${BUILD_DIR}" || die |
| 327 |
WINEPREFIX="${T}/.wine-${ABI}" Xemake test |
| 328 |
} |
| 329 |
|
| 330 |
src_install() { |
| 331 |
local DOCS=( ANNOUNCE AUTHORS README ) |
| 332 |
autotools-multilib_src_install |
| 333 |
|
| 334 |
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" |
| 335 |
if use gecko ; then |
| 336 |
insinto /usr/share/wine/gecko |
| 337 |
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi |
| 338 |
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi |
| 339 |
fi |
| 340 |
if use mono ; then |
| 341 |
insinto /usr/share/wine/mono |
| 342 |
doins "${DISTDIR}"/wine-mono-${MV}.msi |
| 343 |
fi |
| 344 |
if ! use perl ; then |
| 345 |
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die |
| 346 |
fi |
| 347 |
|
| 348 |
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 |
| 349 |
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} |
| 350 |
|
| 351 |
if use abi_x86_64 && ! use abi_x86_32; then |
| 352 |
dosym /usr/bin/wine{64,} # 404331 |
| 353 |
dosym /usr/bin/wine{64,}-preloader |
| 354 |
fi |
| 355 |
|
| 356 |
# respect LINGUAS when installing man pages, #469418 |
| 357 |
for l in de fr pl; do |
| 358 |
use linguas_${l} || rm -r "${D}"usr/share/man/${l}* |
| 359 |
done |
| 360 |
} |
| 361 |
|
| 362 |
pkg_preinst() { |
| 363 |
gnome2_icon_savelist |
| 364 |
} |
| 365 |
|
| 366 |
pkg_postinst() { |
| 367 |
gnome2_icon_cache_update |
| 368 |
fdo-mime_desktop_database_update |
| 369 |
} |
| 370 |
|
| 371 |
pkg_postrm() { |
| 372 |
gnome2_icon_cache_update |
| 373 |
fdo-mime_desktop_database_update |
| 374 |
} |
Archives