summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-12-16 14:31:56 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-12-16 14:31:56 +0000
commit8f6728c4ab0865b22ef5351fa4413b6a667f11ca (patch)
tree32440d5d9db3e6eb180b95d364423da6c475bf76 /app-emulation
parentAdded HTTPS URL to EGIT_REPO_URI to allow live ebuilds to fetch data if firew... (diff)
downloadgentoo-2-8f6728c4ab0865b22ef5351fa4413b6a667f11ca.tar.gz
gentoo-2-8f6728c4ab0865b22ef5351fa4413b6a667f11ca.tar.bz2
gentoo-2-8f6728c4ab0865b22ef5351fa4413b6a667f11ca.zip
Add a warning that on amd64, netapi is currently 64-bit only
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/wine/ChangeLog6
-rw-r--r--app-emulation/wine/wine-1.7.8.ebuild3
-rw-r--r--app-emulation/wine/wine-9999.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0b5bf4d73e85..d5fe7b2bf0d1 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
# 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.487 2013/12/16 00:28:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.488 2013/12/16 14:31:56 tetromino Exp $
+
+ 16 Dec 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.7.8.ebuild,
+ wine-9999.ebuild:
+ Add a warning that on amd64, netapi is currently 64-bit only
*wine-1.7.8 (16 Dec 2013)
*wine-1.6.1 (16 Dec 2013)
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 728bcbf80447..47c27c5621bf 100644
--- a/app-emulation/wine/wine-1.7.8.ebuild
+++ b/app-emulation/wine/wine-1.7.8.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.7.8.ebuild,v 1.1 2013/12/16 00:28:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.2 2013/12/16 14:31:56 tetromino Exp $
EAPI="5"
@@ -301,6 +301,7 @@ do_configure() {
if [[ ${ABI} == amd64 ]]; then
myeconfargs+=( --enable-win64 )
else
+ use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
# We currently don't have 32-bit libnetapi on amd64; #494394
myeconfargs+=(
--without-netapi
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 4ace117b4d68..aa5e6316b341 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.159 2013/12/16 00:28:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.160 2013/12/16 14:31:56 tetromino Exp $
EAPI="5"
@@ -301,6 +301,7 @@ do_configure() {
if [[ ${ABI} == amd64 ]]; then
myeconfargs+=( --enable-win64 )
else
+ use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
# We currently don't have 32-bit libnetapi on amd64; #494394
myeconfargs+=(
--without-netapi