Sync with portage [Sat Dec 31 22:35:05 MSK 2016].

mhiretskiy 702
root 7 years ago
parent 5c86a9a6a4
commit 5e4d5fa995

@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
logwatch mysql ndmp postgres python qt4 rados rados-striper readline scsi-crypto
sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax"
REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
DEPEND="
!app-backup/bacula

@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
logwatch mysql ndmp postgres python qt4 rados rados-striper readline scsi-crypto
sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax"
REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
DEPEND="
!app-backup/bacula

@ -1,2 +1,2 @@
DIST obnam-1.19.1.tar.gz 372739 SHA256 e4210d12e0126f14bc788ccb0c443362eb5f9419ab7ae84a22ff108d269e1819 SHA512 9ed9632eaa23fec5cc1fb39ea51825480cc9b39109fb3c7e6135ef90156d15e3555aaea910714ede94d93fc897ca04bfefae0487629fbf9fe149c5a0ddc74a5e WHIRLPOOL 04b1d072a31de70712438a2314e86c5cdd6c3bc49f655209876834e21f746770a63094a7d48b4be0e17ba928fb3b172787c31bb8dc17bea88d293ec631e6e0ab
DIST obnam-1.20.tar.gz 396452 SHA256 edd0ed36ca6e9f8f294a6ec8217a925fd3646bbc9025e6c10d3136861b0fef08 SHA512 7d98750f1a3ea8f3be961c1359473c12425da4028793d2fca1aec199309aa66c1639bc77d328c5d8713d73882400b5f9cf8b4a263d19e0a355448e87ce837021 WHIRLPOOL b9af5e410eb5ffbfadac79b16f2661794f2602e4b06967eb25cf6c5029161ac91d85ae2b727e661012fcc6e6301e384b8733efbc8acd4507cf16465e240d371d
DIST obnam-1.21.tar.gz 397609 SHA256 d255130cc12deb0195b50667b4aec0c398e178423a884e0a3f4272c1024e2e42 SHA512 65b7f66a1e5105a2a8853a51e703c74ac2747e8dad12a8fcd1007ed2d02a7e15695c71b773b6966fb59ab4c013d1957dce9464fd25ffce61f38aacf009b5ab1a WHIRLPOOL 01f3e84799738eb68360b7140a53bdcb030184e8734a53e3566f477b3f5a473a00fd05d3748a2379e5c241f9a79912092e9015042c09a384a8e52e4bf31c526c

@ -1 +0,0 @@
DIST DucViet45K.zip 4242194 SHA256 0d301c35579ec9ff04f64c56b88f55838755145a7ab0aace8ed5fa23b7003ea9 SHA512 5308600624b167c3e7306f3e622b228f8ade2ab1f4cf3ad30b6732038b323d22b599d516b7759ab34ff16d4b80da6c9ae9ed1cefc9c4b262391bc47f098b63c9 WHIRLPOOL 38abb8927c93fba668128c603074f549ce5c926b42f793c6f670d9c830d9f49cdad9af4641893f9b70ef5448bc773990f942ab576ac2e8690bac74c35e6bae83

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="German"
TO_LANG="Vietnamese"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/DucViet45K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/DucViet

@ -1 +0,0 @@
DIST AnhViet109K.zip 5404916 SHA256 3f4516ea4919664539e1cfd128ad179f9a7fbbefed0c026757c92f9d16705a2f SHA512 1b09efdd0bde10d74420963713f2266e25ce3afee6a84226d1ace17ec7c09db445fa518ea9d3d16128b02acb80cb6c1ef70b637135f223093c7fb471aec8f55d WHIRLPOOL 2d6312d64aa9ac42b0014a970656409c91d13b1d7fa6968e566bb6626156751cb84e23ffaedd378e14661718acec41837be9e38392306189bd4a2a08dc06ad8a

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="English"
TO_LANG="Vietnamese"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/AnhViet109K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/AnhViet

@ -1 +0,0 @@
DIST PhapViet47K.zip 2863474 SHA256 bfe278b646054133ad3aa135425fc785b0dfc13b9595c11fa379d59f872e8ccc SHA512 432aeccac580be37420c04fa9529e5ac31e1ed5aef18f8b8cd52bd9a4b8dce06b969b503f5d3149b67b179533bdfa5068c09746edf76e125e2579fcce5425c02 WHIRLPOOL 1dbc322d406bbaf5ccecf32bba4f89ea94f78f1426c3d2b0fce9f5263e13b1e30186309c7af6e583853d6c4e89b19c00822c6a5043747cb794f8605f8ea988ee

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="French"
TO_LANG="Vietnamese"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/PhapViet47K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/PhapViet

@ -1 +0,0 @@
DIST NgaViet38K.zip 2617330 SHA256 c6e586542aa42d9551a2d9020266b416793af2868af5d54320b2bb94facffd00 SHA512 2510cdb8261011997812ec016e3bf1018729829f849907dea612dc5d2d200fa663091b237c06e67b2fbacf59a58564bb0dd7a4919ada4e574c3fbfa541ba662b WHIRLPOOL 906edfc276e3f97b3710a0e059b5ed0b5374f68ba7f84d55a3deb6b5a413c0710546e0ffde2641a75721314460e52220fdb11a8ce9b77753ee594b56caaac2d6

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="Russian"
TO_LANG="Vietnamese"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/NgaViet38K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/NgaViet

@ -1 +0,0 @@
DIST VietDuc12K.zip 432634 SHA256 68433b7ee5ffbbdc78228cf9b88e10f5dafdfd7dbc064191a7f26a3f18f16f2c SHA512 dc9857072f1598cab5211096f7e48f409e03c864238dbc540cae1f961f2b08f04f4f41110c3662f891a9b94ade62e86eb0457baefbe5cb913f57e593933dba0b WHIRLPOOL 5e5527bdef40cc0aee92cc9165c47e3804ede2cfa8b159ed68e0816b9f8742b9720706740ab7e5dcde5f5af19b7f9a8becb8913aaa7f40ecf098f8d685490152

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="Vietnamese"
TO_LANG="German"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/VietDuc12K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/VietDuc

@ -1 +0,0 @@
DIST VietAnh23K.zip 992221 SHA256 8b2e9a5d4301e797f87023b767e4aece46bf942d1df95fdf4c8116446637e231 SHA512 994cb914a809f503a35bb1d730a3f36503a25149b7f0132016e518208d2677d77ffcc5427cb5dee98df09c0afa1834a894948d1a79532fee18a0802e17160694 WHIRLPOOL b0f2607c3d703282060d52ade0d054f229d042b675b89676f3e4975785b1cad1e1515e048ffc0b85e1a582b63479ac90e18673d99906ec6c05c8014f70312b07

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="Vietnamese"
TO_LANG="English"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/VietAnh23K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/VietAnh

@ -1 +0,0 @@
DIST VietPhap38K.zip 1779343 SHA256 61d1a87ff9477e7b5caacdde353b1bc2bf2f79eb2cea3eed9ff219418b1e2657 SHA512 1a2389df07fd29791d3bab85832e7e0d12e12c9cb4c0800466c8b66e52cedb9dacf4acb2161788788a013e0c01b91b00e7cf059580b2ba93f62b8d42836d8cb5 WHIRLPOOL 73d9b762086ccb598a6eccbfe862d3939bd12a9eafa4f6474673f2888e99f8b58d50e53220d72ef88ba0b8812b842e8ed05818f0e0d8967b4b45b235ca3f9ade

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="Vietnamese"
TO_LANG="French"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/VietPhap38K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/VietPhap

@ -1 +0,0 @@
DIST VietViet30K.zip 2029339 SHA256 67e5e6411ec84e9d45c43132449e3f5e0693a82a10edc54b0a4100f2897c245d SHA512 b5852549724d456d8b9f92dcfbcd2bb63da2ec060d68cb21ed94cc87f6766857678e9594ea8cf13eb0104ba1f56d4c1cf2ab01352752ae0314ce41112267aac0 WHIRLPOOL bd387677987e0444f6f31f194546144124c8289a5210064180e8c20ffa80841f27eacdffd3b71df1195d58375b737e29dd9fee20c8c27937bedcc87a075920ae

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,20 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
FROM_LANG="Vietnamese"
TO_LANG="Vietnamese"
inherit stardict
HOMEPAGE="https://sourceforge.net/projects/ovdp/"
SRC_URI="mirror://gentoo/VietViet30K.zip"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
S=${WORKDIR}/VietViet

@ -1 +0,0 @@
DIST zoinks-0.4.1.tar.gz 322009 SHA256 bd8b229904b2e0aeae4742cc9eda882cd47874c86dcf21df8b3d77c830d301cd SHA512 f1608755b25dd0b4cd2840592b9abd2df462d9a4b97847bf813d46e9f3fca0d15e41ef80b8bafbbb494a7c446b5f727a258f44d28fdbbf2ceddc179292d15a79 WHIRLPOOL 676640d85d9136b9ed227bc1c80a2ae4ac45476eaf6617d988167b78f8c98c2b71951271174ecae5b136fa752e96c7e910d98c5d028c72f47cca18ae96d19f01

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,46 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="programmer's text editor and development environment"
HOMEPAGE="http://zoinks.mikelockwood.com"
SRC_URI="http://${PN}.mikelockwood.com/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="nls"
RDEPEND="x11-libs/libX11
x11-libs/libXpm
x11-libs/libXext
x11-libs/libXt"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
src_prepare() {
sed -i -e 's:-g -Werror::g' configure* || die
tc-export CXX
}
src_configure() {
econf $(use_enable nls) --disable-imlib
}
src_install() {
default
dodoc AUTHORS ChangeLog NEWS README
doicon ide/Pixmaps/${PN}.xpm
make_desktop_entry ${PN} "Zoinks!" ${PN} "Utility;TextEditor"
}
pkg_postinst() {
if ! [[ ${REPLACING_VERSIONS} ]]; then
elog "If you see this message when starting zoinks:"
elog "zoinks: TFont.cpp:40: TFont::TFont(const char*): Assertion \`fFontSet' failed."
elog "You need to install media-fonts/font-adobe-{75,100dpi}"
fi
}

@ -1,3 +0,0 @@
DIST open-vm-tools-10.0.0-3000743.tar.gz 4161070 SHA256 5adef80f43186aff426f4f22b4b31b514d18a1dcc3334d56ed22d2e308803971 SHA512 0529e619b7cc012f3ebb78252157cb6d54c640a701de16516e1125b7147ea2e49f685fbdbbff6de73f2c3d8db87c5f406f8128ba0fcf12e37bc3d66085578c54 WHIRLPOOL f4355d86a4f7d835b6481ff4d7d09786d46ce8107e139fb603f117df41c00a380b7e4f69773b48944ae347d762a02497093828f7820209e7c1c6b5a814312167
DIST open-vm-tools-9.10.0-2476743.tar.gz 4093306 SHA256 e146ad53d744d7793ee72c5271fc49a916613534c14827c227fdaef4b3579c96 SHA512 8c8e4a559c0374e020c8261d4c8f6855efbe3f509745ee02ec03ab9ebce7e1327ec1e5e18f674cb464630ace9dc33b4262ffd119fc237c286ee44327e4590385 WHIRLPOOL 162aba889e249ac229e003a57753ff78b86f612a0753ae83f9de52eb1d0ae0a11aee0279c192eb073dabc76d718747c614d4122395abfc8c8d0f9d80a903189a
DIST open-vm-tools-9.4.0-1280544.tar.gz 3659504 SHA256 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399 SHA512 07b36f49713140606f74864b59c2e01c9ed83a960dd3f5d172b84fc75e760f7370065774a0e26897924af60454c86b682ca0fd32276b0e9fb17b268247f8cbdf WHIRLPOOL 88533768cf718de3b5f64e688597209fa2029d02cdf350d7fd05ec8dd8ca0f0c125a8d1445c1ec9287bc486076d5c335f3cc615c3f0b9aa7bac84e921da4c9e6

@ -1 +0,0 @@
KERNEL=="vsock", GROUP="vmware", MODE=660

@ -1,74 +0,0 @@
From 08836a47c56b47b658025e41a20027c5d915f836 Mon Sep 17 00:00:00 2001
From: "Scott M. Kroll" <skroll@gmail.com>
Date: Fri, 15 Aug 2014 10:40:38 -0400
Subject: [PATCH 1/3] Fix vmxnet module on kernels >= 3.16
* Add compat check for ethtool_ops in net_device struct.
* SET_ETHTOOL_OPS is no longer defined, but can be manually.
---
open-vm-tools/modules/linux/shared/compat_netdevice.h | 4 ++++
open-vm-tools/modules/linux/vmxnet/vmxnet.c | 13 ++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/open-vm-tools/modules/linux/shared/compat_netdevice.h b/open-vm-tools/modules/linux/shared/compat_netdevice.h
index 3aec25b..a65d59b 100644
--- a/open-vm-tools/modules/linux/shared/compat_netdevice.h
+++ b/open-vm-tools/modules/linux/shared/compat_netdevice.h
@@ -337,4 +337,8 @@ typedef netdev_features_t compat_netdev_features_t;
typedef u32 compat_netdev_features_t;
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) || defined(SET_ETHTOOL_OPS)
+#define VMW_HAVE_ETHTOOL_OPS 1
+#endif
+
#endif /* __COMPAT_NETDEVICE_H__ */
diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet.c b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
index 33afb9b..40abde5 100644
--- a/open-vm-tools/modules/linux/vmxnet/vmxnet.c
+++ b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
@@ -279,8 +279,7 @@ vmxnet_change_mtu(struct net_device *dev, int new_mtu)
#endif
-
-#ifdef SET_ETHTOOL_OPS
+#ifdef VMW_HAVE_ETHTOOL_OPS
/*
*----------------------------------------------------------------------------
*
@@ -526,7 +525,7 @@ vmxnet_ethtool_ops = {
};
-#else /* !defined(SET_ETHTOOL_OPS) */
+#else /* !defined(VMW_HAVE_ETHTOOL_OPS) */
/*
@@ -739,7 +738,7 @@ vmxnet_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
}
return -EOPNOTSUPP;
}
-#endif /* SET_ETHTOOL_OPS */
+#endif /* !defined(VMW_HAVE_ETHTOOL_OPS) */
/*
@@ -1142,8 +1141,12 @@ vmxnet_probe_device(struct pci_dev *pdev, // IN: vmxnet PCI device
dev->watchdog_timeo = VMXNET_WATCHDOG_TIMEOUT;
#endif
-#ifdef SET_ETHTOOL_OPS
+#ifdef VMW_HAVE_ETHTOOL_OPS
+# ifdef SET_ETHTOOL_OPS
SET_ETHTOOL_OPS(dev, &vmxnet_ethtool_ops);
+# else
+ dev->ethtool_ops = &vmxnet_ethtool_ops;
+# endif
#else
dev->do_ioctl = vmxnet_ioctl;
#endif
--
2.3.4

@ -1,34 +0,0 @@
From 8df98f3c779fa43d073a42e82bd18cf28c2bd4af Mon Sep 17 00:00:00 2001
From: Wendell Smith <wendellwsmith@gmail.com>
Date: Sat, 7 Feb 2015 15:42:13 -0500
Subject: [PATCH 2/3] Fix d_alias to d_u.d_alias for kernel 3.18
---
open-vm-tools/modules/linux/vmhgfs/inode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/open-vm-tools/modules/linux/vmhgfs/inode.c b/open-vm-tools/modules/linux/vmhgfs/inode.c
index 77b1669..2d289e3 100644
--- a/open-vm-tools/modules/linux/vmhgfs/inode.c
+++ b/open-vm-tools/modules/linux/vmhgfs/inode.c
@@ -1917,7 +1917,7 @@ HgfsPermission(struct inode *inode,
p,
#endif
&inode->i_dentry,
- d_alias) {
+ d_u.d_alias) {
int dcount = hgfs_d_count(dentry);
if (dcount) {
LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
@@ -1970,7 +1970,7 @@ HgfsPermission(struct inode *inode,
/* Find a dentry with valid d_count. Refer bug 587879. */
list_for_each(pos, &inode->i_dentry) {
int dcount;
- struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
+ struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
dcount = hgfs_d_count(dentry);
if (dcount) {
LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
--
2.3.4

@ -1,429 +0,0 @@
From 61751db8cd4679fc76034a5d1f99df6c64c48de6 Mon Sep 17 00:00:00 2001
From: lotan <lotan@gmx.de>
Date: Mon, 30 Mar 2015 08:58:56 +0200
Subject: [PATCH 3/3] Make vmhgfs work on kernel 3.19.
---
open-vm-tools/modules/linux/vmhgfs/dir.c | 35 ++++++------
open-vm-tools/modules/linux/vmhgfs/file.c | 65 +++++++++++-----------
open-vm-tools/modules/linux/vmhgfs/fsutil.c | 3 +-
.../modules/linux/vmhgfs/shared/compat_dentry.h | 10 ++++
4 files changed, 63 insertions(+), 50 deletions(-)
create mode 100644 open-vm-tools/modules/linux/vmhgfs/shared/compat_dentry.h
diff --git a/open-vm-tools/modules/linux/vmhgfs/dir.c b/open-vm-tools/modules/linux/vmhgfs/dir.c
index 809611a..c6a87bd 100644
--- a/open-vm-tools/modules/linux/vmhgfs/dir.c
+++ b/open-vm-tools/modules/linux/vmhgfs/dir.c
@@ -31,6 +31,7 @@
#include "compat_kernel.h"
#include "compat_slab.h"
#include "compat_mutex.h"
+#include "compat_dentry.h"
#include "cpName.h"
#include "hgfsEscape.h"
@@ -414,7 +415,7 @@ HgfsPackDirOpenRequest(struct file *file, // IN: File pointer for this open
/* Build full name to send to server. */
if (HgfsBuildPath(name, req->bufferSize - (requestSize - 1),
- file->f_dentry) < 0) {
+ DENTRY(file)) < 0) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsPackDirOpenRequest: build path failed\n"));
return -EINVAL;
}
@@ -560,8 +561,8 @@ HgfsPrivateDirRelease(struct file *file, // IN: File for the dir getting relea
int result = 0;
ASSERT(file);
- ASSERT(file->f_dentry);
- ASSERT(file->f_dentry->d_sb);
+ ASSERT(DENTRY(file));
+ ASSERT(DENTRY(file)->d_sb);
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsPrivateDirRelease: close fh %u\n", handle));
@@ -704,7 +705,7 @@ HgfsDirLlseek(struct file *file,
loff_t offset,
int origin)
{
- struct dentry *dentry = file->f_dentry;
+ struct dentry *dentry = DENTRY(file);
struct inode *inode = dentry->d_inode;
compat_mutex_t *mtx;
@@ -853,7 +854,7 @@ HgfsReaddirRefreshEntries(struct file *file) // IN: File pointer for this ope
}
LOG(6, (KERN_DEBUG "VMware hgfs: %s: error: stale handle (%s) return %d)\n",
- __func__, file->f_dentry->d_name.name, result));
+ __func__, DENTRY(file)->d_name.name, result));
return result;
}
@@ -988,9 +989,9 @@ HgfsReaddirNextEntry(struct file *file, // IN: file
char *fileName = NULL;
int result;
- ASSERT(file->f_dentry->d_inode->i_sb);
+ ASSERT(DENTRY(file)->d_inode->i_sb);
- si = HGFS_SB_TO_COMMON(file->f_dentry->d_inode->i_sb);
+ si = HGFS_SB_TO_COMMON(DENTRY(file)->d_inode->i_sb);
*entryIgnore = FALSE;
/*
@@ -1079,18 +1080,18 @@ HgfsReaddirNextEntry(struct file *file, // IN: file
*/
if (!strncmp(entryName, ".", sizeof ".")) {
if (!dotAndDotDotIgnore) {
- *entryIno = file->f_dentry->d_inode->i_ino;
+ *entryIno = DENTRY(file)->d_inode->i_ino;
} else {
*entryIgnore = TRUE;
}
} else if (!strncmp(entryName, "..", sizeof "..")) {
if (!dotAndDotDotIgnore) {
- *entryIno = compat_parent_ino(file->f_dentry);
+ *entryIno = compat_parent_ino(DENTRY(file));
} else {
*entryIgnore = TRUE;
}
} else {
- *entryIno = HgfsGetFileInode(&entryAttrs, file->f_dentry->d_inode->i_sb);
+ *entryIno = HgfsGetFileInode(&entryAttrs, DENTRY(file)->d_inode->i_sb);
}
if (*entryIgnore) {
@@ -1170,16 +1171,16 @@ HgfsDoReaddir(struct file *file, // IN:
ASSERT(filldirCtx);
if (!file ||
- !(file->f_dentry) ||
- !(file->f_dentry->d_inode)) {
+ !(DENTRY(file)) ||
+ !(DENTRY(file)->d_inode)) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsReaddir: null input\n"));
return -EFAULT;
}
LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s, inum %lu, pos %Lu)\n",
__func__,
- file->f_dentry->d_name.name,
- file->f_dentry->d_inode->i_ino,
+ DENTRY(file)->d_name.name,
+ DENTRY(file)->d_inode->i_ino,
*currentPos));
/*
@@ -1294,7 +1295,7 @@ HgfsReaddir(struct file *file, // IN:
/* If either dot and dotdot are filled in for us we can exit. */
if (!dir_emit_dots(file, ctx)) {
LOG(6, (KERN_DEBUG "VMware hgfs: %s: dir_emit_dots(%s, @ %Lu)\n",
- __func__, file->f_dentry->d_name.name, ctx->pos));
+ __func__, DENTRY(file)->d_name.name, ctx->pos));
return 0;
}
@@ -1464,8 +1465,8 @@ HgfsDirRelease(struct inode *inode, // IN: Inode that the file* points to
ASSERT(inode);
ASSERT(file);
- ASSERT(file->f_dentry);
- ASSERT(file->f_dentry->d_sb);
+ ASSERT(DENTRY(file));
+ ASSERT(DENTRY(file)->d_sb);
handle = FILE_GET_FI_P(file)->handle;
diff --git a/open-vm-tools/modules/linux/vmhgfs/file.c b/open-vm-tools/modules/linux/vmhgfs/file.c
index bbde3f4..39502d0 100644
--- a/open-vm-tools/modules/linux/vmhgfs/file.c
+++ b/open-vm-tools/modules/linux/vmhgfs/file.c
@@ -32,6 +32,7 @@
#include "compat_fs.h"
#include "compat_kernel.h"
#include "compat_slab.h"
+#include "compat_dentry.h"
/* Must be after compat_fs.h */
#if defined VMW_USE_AIO
@@ -384,7 +385,7 @@ HgfsPackOpenRequest(struct inode *inode, // IN: Inode of the file to open
/* Build full name to send to server. */
if (HgfsBuildPath(name,
req->bufferSize - (requestSize - 1),
- file->f_dentry) < 0) {
+ DENTRY(file)) < 0) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsPackOpenRequest: build path "
"failed\n"));
return -EINVAL;
@@ -523,8 +524,8 @@ HgfsOpen(struct inode *inode, // IN: Inode of the file to open
ASSERT(inode);
ASSERT(inode->i_sb);
ASSERT(file);
- ASSERT(file->f_dentry);
- ASSERT(file->f_dentry->d_inode);
+ ASSERT(DENTRY(file));
+ ASSERT(DENTRY(file)->d_inode);
iinfo = INODE_GET_II_P(inode);
@@ -605,7 +606,7 @@ HgfsOpen(struct inode *inode, // IN: Inode of the file to open
* This is not the root of our file system so there should always
* be a parent.
*/
- ASSERT(file->f_dentry->d_parent);
+ ASSERT(DENTRY(file)->d_parent);
/*
* Here we obtain a reference on the parent to make sure it doesn't
@@ -620,10 +621,10 @@ HgfsOpen(struct inode *inode, // IN: Inode of the file to open
* We could do this if we were willing to give up support for
* O_EXCL on 2.4 kernels.
*/
- dparent = dget(file->f_dentry->d_parent);
+ dparent = dget(DENTRY(file)->d_parent);
iparent = dparent->d_inode;
- HgfsSetUidGid(iparent, file->f_dentry,
+ HgfsSetUidGid(iparent, DENTRY(file),
current_fsuid(), current_fsgid());
dput(dparent);
@@ -683,7 +684,7 @@ out:
* forcing a revalidate on one will not force it on any others.
*/
if (result != 0 && iinfo->createdAndUnopened == TRUE) {
- HgfsDentryAgeForce(file->f_dentry);
+ HgfsDentryAgeForce(DENTRY(file));
}
return result;
}
@@ -772,13 +773,13 @@ HgfsFileRead(struct kiocb *iocb, // IN: I/O control block
ASSERT(iocb);
ASSERT(iocb->ki_filp);
- ASSERT(iocb->ki_filp->f_dentry);
+ ASSERT(DENTRY(iocb->ki_filp));
ASSERT(iov);
pos = HGFS_IOCB_TO_POS(iocb, offset);
iovSegs = HGFS_IOV_TO_SEGS(iov, numSegs);
- readDentry = iocb->ki_filp->f_dentry;
+ readDentry = DENTRY(iocb->ki_filp);
LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s/%s)\n",
__func__, readDentry->d_parent->d_name.name,
@@ -882,13 +883,13 @@ HgfsFileWrite(struct kiocb *iocb, // IN: I/O control block
ASSERT(iocb);
ASSERT(iocb->ki_filp);
- ASSERT(iocb->ki_filp->f_dentry);
+ ASSERT(DENTRY(iocb->ki_filp));
ASSERT(iov);
pos = HGFS_IOCB_TO_POS(iocb, offset);
iovSegs = HGFS_IOV_TO_SEGS(iov, numSegs);
- writeDentry = iocb->ki_filp->f_dentry;
+ writeDentry = DENTRY(iocb->ki_filp);
LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s/%s)\n",
__func__, writeDentry->d_parent->d_name.name,
@@ -951,7 +952,7 @@ HgfsRead(struct file *file, // IN: File to read from
int result;
ASSERT(file);
- ASSERT(file->f_dentry);
+ ASSERT(DENTRY(file));
ASSERT(buf);
ASSERT(offset);
@@ -959,7 +960,7 @@ HgfsRead(struct file *file, // IN: File to read from
__func__, file->f_dentry->d_parent->d_name.name,
file->f_dentry->d_name.name, count, (long long) *offset));
- result = HgfsRevalidate(file->f_dentry);
+ result = HgfsRevalidate(DENTRY(file));
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsRead: invalid dentry\n"));
goto out;
@@ -1002,8 +1003,8 @@ HgfsWrite(struct file *file, // IN: File to write to
int result;
ASSERT(file);
- ASSERT(file->f_dentry);
- ASSERT(file->f_dentry->d_inode);
+ ASSERT(DENTRY(file));
+ ASSERT(DENTRY(file)->d_inode);
ASSERT(buf);
ASSERT(offset);
@@ -1011,7 +1012,7 @@ HgfsWrite(struct file *file, // IN: File to write to
__func__, file->f_dentry->d_parent->d_name.name,
file->f_dentry->d_name.name, count, (long long) *offset));
- result = HgfsRevalidate(file->f_dentry);
+ result = HgfsRevalidate(DENTRY(file));
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsWrite: invalid dentry\n"));
goto out;
@@ -1051,7 +1052,7 @@ HgfsSeek(struct file *file, // IN: File to seek
loff_t result = -1;
ASSERT(file);
- ASSERT(file->f_dentry);
+ ASSERT(DENTRY(file));
LOG(6, (KERN_DEBUG "VMware hgfs: %s(%s/%s, %u, %lld, %d)\n",
__func__,
@@ -1059,7 +1060,7 @@ HgfsSeek(struct file *file, // IN: File to seek
file->f_dentry->d_name.name,
FILE_GET_FI_P(file)->handle, offset, origin));
- result = (loff_t) HgfsRevalidate(file->f_dentry);
+ result = (loff_t) HgfsRevalidate(DENTRY(file));
if (result) {
LOG(6, (KERN_DEBUG "VMware hgfs: %s: invalid dentry\n", __func__));
goto out;
@@ -1143,8 +1144,8 @@ HgfsFlush(struct file *file // IN: file to flush
int ret = 0;
LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s/%s)\n",
- __func__, file->f_dentry->d_parent->d_name.name,
- file->f_dentry->d_name.name));
+ __func__, DENTRY(file)->d_parent->d_name.name,
+ DENTRY(file)->d_name.name));
if ((file->f_mode & FMODE_WRITE) == 0) {
goto exit;
@@ -1157,7 +1158,7 @@ HgfsFlush(struct file *file // IN: file to flush
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
ret = vfs_fsync(file, 0);
#else
- ret = HgfsDoFsync(file->f_dentry->d_inode);
+ ret = HgfsDoFsync(DENTRY(file)->d_inode);
#endif
exit:
@@ -1215,13 +1216,13 @@ HgfsFsync(struct file *file, // IN: File we operate on
LOG(4, (KERN_DEBUG "VMware hgfs: %s(%s/%s, %lld, %lld, %d)\n",
__func__,
- file->f_dentry->d_parent->d_name.name,
- file->f_dentry->d_name.name,
+ DENTRY(file)->d_parent->d_name.name,
+ DENTRY(file)->d_name.name,
startRange, endRange,
datasync));
/* Flush writes to the server and return any errors */
- inode = file->f_dentry->d_inode;
+ inode = DENTRY(file)->d_inode;
#if defined VMW_FSYNC_31
ret = filemap_write_and_wait_range(inode->i_mapping, startRange, endRange);
#else
@@ -1261,14 +1262,14 @@ HgfsMmap(struct file *file, // IN: File we operate on
ASSERT(file);
ASSERT(vma);
- ASSERT(file->f_dentry);
+ ASSERT(DENTRY(file));
LOG(6, (KERN_DEBUG "VMware hgfs: %s(%s/%s)\n",
__func__,
file->f_dentry->d_parent->d_name.name,
file->f_dentry->d_name.name));
- result = HgfsRevalidate(file->f_dentry);
+ result = HgfsRevalidate(DENTRY(file));
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: %s: invalid dentry\n", __func__));
goto out;
@@ -1309,8 +1310,8 @@ HgfsRelease(struct inode *inode, // IN: Inode that this file points to
ASSERT(inode);
ASSERT(file);
- ASSERT(file->f_dentry);
- ASSERT(file->f_dentry->d_sb);
+ ASSERT(DENTRY(file));
+ ASSERT(DENTRY(file)->d_sb);
handle = FILE_GET_FI_P(file)->handle;
LOG(6, (KERN_DEBUG "VMware hgfs: %s(%s/%s, %u)\n",
@@ -1443,14 +1444,14 @@ HgfsSendfile(struct file *file, // IN: File to read from
ssize_t result;
ASSERT(file);
- ASSERT(file->f_dentry);
+ ASSERT(DENTRY(file));
ASSERT(target);
ASSERT(offset);
ASSERT(actor);
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsSendfile: was called\n"));
- result = HgfsRevalidate(file->f_dentry);
+ result = HgfsRevalidate(DENTRY(file));
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsSendfile: invalid dentry\n"));
goto out;
@@ -1497,7 +1498,7 @@ HgfsSpliceRead(struct file *file, // IN: File to read from
ssize_t result;
ASSERT(file);
- ASSERT(file->f_dentry);
+ ASSERT(DENTRY(file));
LOG(6, (KERN_DEBUG "VMware hgfs: %s(%s/%s, %lu@%Lu)\n",
__func__,
@@ -1505,7 +1506,7 @@ HgfsSpliceRead(struct file *file, // IN: File to read from
file->f_dentry->d_name.name,
(unsigned long) len, (unsigned long long) *offset));
- result = HgfsRevalidate(file->f_dentry);
+ result = HgfsRevalidate(DENTRY(file));
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: %s: invalid dentry\n", __func__));
goto out;
diff --git a/open-vm-tools/modules/linux/vmhgfs/fsutil.c b/open-vm-tools/modules/linux/vmhgfs/fsutil.c
index 5023324..a2e794c 100644
--- a/open-vm-tools/modules/linux/vmhgfs/fsutil.c
+++ b/open-vm-tools/modules/linux/vmhgfs/fsutil.c
@@ -36,6 +36,7 @@
#include "compat_sched.h"
#include "compat_slab.h"
#include "compat_spinlock.h"
+#include "compat_dentry.h"
#include "vm_assert.h"
#include "cpName.h"
@@ -1924,7 +1925,7 @@ HgfsCreateFileInfo(struct file *file, // IN: File pointer to attach to
ASSERT(file);
- inodeInfo = INODE_GET_II_P(file->f_dentry->d_inode);
+ inodeInfo = INODE_GET_II_P(DENTRY(file)->d_inode);
ASSERT(inodeInfo);
/* Get the mode of the opened file. */
diff --git a/open-vm-tools/modules/linux/vmhgfs/shared/compat_dentry.h b/open-vm-tools/modules/linux/vmhgfs/shared/compat_dentry.h
new file mode 100644
index 0000000..dd53760
--- /dev/null
+++ b/open-vm-tools/modules/linux/shared/compat_dentry.h
@@ -0,0 +1,10 @@
+#ifndef __COMPAT_DENTRY_H__
+# define __COMPAT_DENTRY_H__
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+# define DENTRY(file) (file->f_path.dentry)
+#else
+# define DENTRY(file) (file->f_dentry)
+#endif
+
+#endif /* __COMPAT_DENTRY_H__ */
--
2.3.4

@ -1,28 +0,0 @@
diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
--- a/modules/linux/vmsync/sync.c 2012-08-01 19:02:59.000000000 -0700
+++ b/modules/linux/vmsync/sync.c 2012-10-14 07:38:18.000000000 -0700
@@ -162,7 +162,11 @@ VmSyncThawDevices(void *_state) // IN
cancel_delayed_work(&state->thawTask);
list_for_each_safe(cur, tmp, &state->devices) {
dev = list_entry(cur, VmSyncBlockDevice, list);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
+#else
if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
+#endif
thaw_bdev(dev->bdev, dev->sb);
atomic_dec(&gFreezeCount);
}
@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state,
* the superblock is already frozen.
*/
if (inode->i_sb->s_bdev == NULL ||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
+#else
inode->i_sb->s_frozen != SB_UNFROZEN) {
+#endif
result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
compat_path_release(&nd);
goto exit;

@ -1,13 +0,0 @@
diff --git a/modules/linux/vmblock/linux/control.c b/modules/linux/vmblock/linux/control.c
index 79716bd..2dd83fe 100644
--- a/modules/linux/vmblock/linux/control.c
+++ b/modules/linux/vmblock/linux/control.c
@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
- putname(name);
+ __putname(name);
return retval;
}

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
<maintainer type="project">
<email>vmware@gentoo.org</email>
<name>Gentoo VMware Project</name>
</maintainer>
<longdescription>
The Open Virtual Machine Tools (open-vm-tools) are the open source
implementation of VMware Tools. They are a set of guest operating system
virtualization components that enhance performance and user experience
of virtual machines.
</longdescription>
<use>
<flag name="vmhgfs">Build the vmhgfs module for file sharing support with the host</flag>
<flag name="vmxnet">Build the vmxnet module (older virtual NIC)</flag>
</use>
<upstream>
<remote-id type="sourceforge">open-vm-tools</remote-id>
</upstream>
</pkgmetadata>

@ -1,69 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils linux-mod udev
MY_PN=${PN%-kmod}
MY_P=${MY_PN}-${PV/_p/-}
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
# See logic in configure.ac.
local MODULES=
if kernel_is -lt 3 3; then
MODULES+=" vmxnet"
fi
if kernel_is -lt 4; then
MODULES+=" vmhgfs"
fi
if kernel_is -lt 3 9; then
MODULES+=" vmci vsock"
else
CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
fi
if kernel_is -lt 3; then
MODULES+=" vmblock vmsync"
else
CONFIG_CHECK+=" ~FUSE_FS"
fi
local mod
for mod in ${MODULES}; do
MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})"
done
linux-mod_pkg_setup
}
src_prepare() {
epatch_user
}
src_configure() {
BUILD_TARGETS="auto-build"
export OVT_SOURCE_DIR="${S}"
export LINUXINCLUDE="${KV_OUT_DIR}/include"
}
src_install() {
linux-mod_src_install
udev_dorules "${FILESDIR}/60-vmware.rules"
}

@ -1,68 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils linux-mod versionator udev
MY_PN=${PN%-kmod}
MY_P=${MY_PN}-${PV/_p/-}
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+vmhgfs +vmxnet"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
# See logic in configure.ac.
local MODULES=
use vmhgfs && MODULES+=" vmhgfs"
use vmxnet && MODULES+=" vmxnet"
if kernel_is -lt 3 9; then
MODULES+=" vmci vsock"
else
CONFIG_CHECK+=" VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
fi
if kernel_is -lt 3; then
MODULES+=" vmblock vmsync"
else
CONFIG_CHECK+=" ~FUSE_FS"
fi
local mod
for mod in ${MODULES}; do
MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})"
done
linux-mod_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/9.10.0-0001-Fix-vmxnet-module-on-kernels-3.16.patch
epatch "${FILESDIR}"/9.10.0-0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
epatch "${FILESDIR}"/9.10.0-0003-Fix-f_dentry-msghdr-kernel-3.19.patch
epatch_user
}
src_configure() {
BUILD_TARGETS="auto-build"
export OVT_SOURCE_DIR="${S}"
export LINUXINCLUDE="${KV_OUT_DIR}/include"
}
src_install() {
linux-mod_src_install
udev_dorules "${FILESDIR}/60-vmware.rules"
}

@ -1,66 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils linux-mod versionator udev
MY_PN="${PN/-kmod}"
MY_PV="$(replace_version_separator 3 '-')"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
pkg_setup() {
CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3
!UIDGID_STRICT_TYPE_CHECKS"
# See logic in configure.ac.
local MODULES="vmxnet vmhgfs"
if kernel_is -lt 3 9; then
MODULES+=" vmci vsock"
else
CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
fi
if kernel_is -lt 3; then
MODULES+=" vmblock vmsync"
else
CONFIG_CHECK+=" ~FUSE_FS"
fi
local mod
for mod in ${MODULES}; do
MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})"
done
linux-mod_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/frozen.patch"
epatch "${FILESDIR}/putname.patch"
epatch_user
}
src_configure() {
BUILD_TARGETS="auto-build"
export OVT_SOURCE_DIR="${S}"
export LINUXINCLUDE="${KV_OUT_DIR}/include"
}
src_install() {
linux-mod_src_install
udev_dorules "${FILESDIR}/60-vmware.rules"
}

@ -15,6 +15,9 @@ DIST wine-1.9.17.tar.bz2 23440011 SHA256 6e1ee9dc2f3a11d529dc0133c4c0afb9e6e5440
DIST wine-1.9.18.tar.bz2 23473716 SHA256 26614baa0daac5a0953c04590f187559e5edc314cb34491322f280b34f3268d8 SHA512 fc8ccf844c5913bb9e351f244cf6ec610caabc9513761b140b129e70a56265133a0cbc7b585bf83b028421f29c5ddc0885abfc98cd9a2dc2b0863d6dbb9b59ee WHIRLPOOL 9894a3ee903e39a665b2d4a06ad46708006c4ef9d28074b0d0dbe342186d0ad307b3d41810cc1e6d370fe003ada6ef52d70e568efd85b4b36d4d686f55df3540
DIST wine-1.9.19.tar.bz2 23526483 SHA256 b5fe29a84e712f94f4d33b5f2952b45233c13b49ba3459dcee8a50b06147a888 SHA512 f5f60579efd13b6bc44aebc0e7c06fea8e1c0e2bb86582ca3fd189d122224d9d587c7a49833e6227a00444b4616ed02c747020557b3f847737e3e187bc8cc2c9 WHIRLPOOL f1134f186fa17ee7fb28fba28fb35a8d26337b53e532b30e997db336739220ac186de4a8c6dfaa4653f3dbde1cf53f24a4ac8bd3fc58c01ec5529699c3116934
DIST wine-1.9.20.tar.bz2 23555024 SHA256 2769f30642329916f12696f7be225644d28fc54d1b9181c979381d70b9a279df SHA512 31841298104592eb615e0a3d70b06b69b5226f8c2b8865e639407399d8a19e20527779d76fe08fb913f6114c4908401f7efa9cfa56fc3360b832c30cc523e764 WHIRLPOOL 3a9fcdf8436f41c863e282b464132bda4ac73e2b0da4e995e93946400e819aa1b432dc7e845b820d1ffd995f6fe054878012323585e8d56186ac8b9e36f6047a
DIST wine-1.9.21.tar.bz2 23561191 SHA256 8b6dd027021be9dd646d65bd19c0334c36dcf9403d8ed4a6e9460b6703efade1 SHA512 0449dd56907900a963a0c70dfb86e189a3edd5ae6b04a64a3d56af2155777c78c56b51ae67d7b97f796f65d731b0ac168555efda3609a6357eefbe537eb20bfa WHIRLPOOL ce593cc6a55482e25c29d43cb1c9dc6e18ed5335e88d2509edcc2c7b4ad7947b29c330e1154a58c88f7207f8d4fa4bb4cc49e8b4c1bb42a805e73238a9156627
DIST wine-1.9.22.tar.bz2 23616095 SHA256 a3bf8e1ac7c7a742601e4215687c8374dda4050ea64c0fc90fb196645a41ec41 SHA512 ab26985c493ada8ebf6fe6cfbed392319a98ee9c337236f7fe979bb0a9f3149aefb6e448434143c825f7d5c0e7b394619c6a503834081e6126ae9c6715cb14fd WHIRLPOOL 771bbc53a668cd15ebd49011ce582cc16025988d0fb75d788913d1d80bc30a131713d4f6a425abb520332a622e9e620b5c6bdb55c88d34e02751eff34a5265f9
DIST wine-1.9.23.tar.bz2 23573977 SHA256 e3efa726f6b3df75cc1151341300c0dc9cd171d84313a428ca44684df9c4368c SHA512 046daff1a896dbcdeb019ec76eeeca1a13b79c2d82e525984ebb247358f479fb3e37fe33cee6046b6bb97eab740ab9001c6023d9dccf0d00430eebd82bbc52c2 WHIRLPOOL f1b4ad8f3315f1e28e630d5429b2da2f83157ca77d0f6860f2f5393bdc8c27f7a4cb4c087b7e53d5e00c1aa470e6400e5f9b7facbf235069530190bc0506cad3
DIST wine-1.9.4.tar.bz2 22974777 SHA256 75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512 e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c WHIRLPOOL 875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
DIST wine-1.9.5.tar.bz2 23034629 SHA256 fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07 WHIRLPOOL 7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
DIST wine-1.9.6.tar.bz2 23071838 SHA256 3d2b862feefd89eca954c1cbc16a28e0ce851aeea1555bc1842ffc9aab2c1557 SHA512 d56d5b18a26b4902ac0138a4358f91a027f929a3ae70346e48b529eb7f09f7f1971bdae52d6a37dabbb598771ee5754b320e39c6ef26700202bf6be90b8b101b WHIRLPOOL 544ad527ceeb9339fd7fb35d847451dbdac79da6226cf15fb2c4be01eed3babe4c5e343236c5005553084ff83ce4e274305b5f91b2bf03a6a27d695c4ece280c
@ -32,6 +35,9 @@ DIST wine-d3d9-1.9.17.tar.gz 46417 SHA256 6663f76c27d5507269d094f6d86d995efdfa8a
DIST wine-d3d9-1.9.18.tar.gz 50653 SHA256 7cf523ca7f36ecd4be2dd1f0d491d7bd4911a7a36781af78a5b4f735ab58cb23 SHA512 5fcb07349f16f975d50ee6fd0da6cb1943a348707a3bf29ba4dc914d63fab78f506ea7a86696bbb42b57cca6fcfedaf062925ef3b0447745764465b1491bb7e6 WHIRLPOOL b415ad483cbef12abe565ae8de62ce90f44fedfeabd6df88451788781ca6e8577b696c56de915addbc970b3061b3b4fe661660f69dac1ed2059bfe57e42c58f7
DIST wine-d3d9-1.9.19.tar.gz 51406 SHA256 59c872728c5dc77d5b5a4ec2fb2965174f1317cf7650ae64ce8b5fa90d73b56e SHA512 e9d7207ccbce6849fc1e6dae1d10b94a74b391348b4792ad5440687e6670d11d17b883ba024fe2d93cbde362b44e4bf01196b36c68763c72750e51a6ec5e9d99 WHIRLPOOL 45bf7947f7d78b0666be79f535087fd2b431ac646b45c66cebc2b6eff42d8b0f7c69249d1b105334959712ad881b841ff4ddf56cf17b5e6b2aa1b8c645e9b9a5
DIST wine-d3d9-1.9.20.tar.gz 51410 SHA256 a16f57dd755c8a5ddfaa2f573b2b72a397afa459ff2df4a884ea9b6fe3d5756e SHA512 8214ec5b621f18aba7fc97d6323bf1fdcece106ae05c9343092c22777f2735aae89df72e35d4ab032fc30d4c4d88daa9dc27bb2b50d8fb9fa094c509f8329a2a WHIRLPOOL 83c3ca85bf865d8ff55d84890a9a5c3be1ed5bfd3050c0dea9dc77425162bd70298097ff58bf0cbb9791cbfef37e9b0a5276c95bed29fa668d53a3338b9d4b50
DIST wine-d3d9-1.9.21.tar.gz 51414 SHA256 47d0b9cb01056aff44789a3b3e396eec9da4d211d0a9563a248f52a0cad33310 SHA512 b59c0ddd1c4e1ca8526e81dd81301d363a8106c2a3cfdea2b6b5a9d5f91f8462669ca104c300cb36f83f8b227fc6107ef15ae28d522eeaabdfc6e9813e301b41 WHIRLPOOL 3b83d943f6178a032a43abceb067ac34d574f0b2d1178be9d2115766959305e5dbff68382ac958ca7c5bd28f5d0940632543d955111c1e88f85b2e6f9ced7514
DIST wine-d3d9-1.9.22.tar.gz 47356 SHA256 ea7c97aa0ea1413e99da960f85af403e9904ba427a6787fbd6000da27d100786 SHA512 180a6d73ec478667514f995da0521c339d97d345c7cf565d4c8bece0583bd094f10bbcca08f09150a54473ccca03dc27f571bb11b0a2acc65049bc34a04b55fa WHIRLPOOL 023446b2e0349561c491a6f3379a1e3d062aa8d808b002f332bcffce2665da161f972803c854757456ac0d2736362f30624062296cf5ce9e37457978753ae884
DIST wine-d3d9-1.9.23.tar.gz 47690 SHA256 3d2f5b6ef1b7b7f09934ac3c0beafe23b9062177e77623f233d53dda29215b19 SHA512 52fee3f3ba48a5347f5153fa667c9257e725983fe70d1ef3d212acaa4d301441c60e35473aeb343bb16e3e4e8b15c4303e5fbbf74df9989c658b01511de2af6e WHIRLPOOL 34abb6ab65c0d0e16cee8fbb228c11853492889a9c78be5f58e62348b282d967293241323da93aff265027cf4957dc7be36820028adf46a62c978f844ef5446e
DIST wine-d3d9-1.9.9.tar.gz 45615 SHA256 cc6575ef97c6ff74d11d370f6af012c82b33697cb5d120d93d3d501623ef4856 SHA512 142e4c11c392a7999093c6703e3e506c365633e7ae4c2426d164e411e5d28fd0c7b00acffc0ca35c755d8ff6d8585072f6a3d3bcb8b5e32417db5597f236c4d0 WHIRLPOOL d56f84a455dc643f756fedfffdc73640cb34aa8164df747fe44f204dd7165d7b000c22de8c33c9978ad97b32b8b6d285551de8607acf75b5f079cb7eeeadb05e
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
@ -54,6 +60,9 @@ DIST wine-staging-1.9.17.tar.gz 9920187 SHA256 74c1263f978e08bb8d53806a384ae4cac
DIST wine-staging-1.9.18.tar.gz 9952730 SHA256 eac41973864486662bc42c8a5692f20a83f9bf6dc65b94d290847bd31e24ac48 SHA512 572ea2c4944f00374ab731ec16596e50149abd4adfb3596d5127d1459d09f6cc1814f98fd09306c3cf4ff0cd24be068f83cc32ed8a2bb1af439e8408e72dd7eb WHIRLPOOL e9e0f7120508f64d41e23a5015ca12a102a1250f87c81cb6d5bbe893301db1a0918eee187f8dad43d8950cc5113552ee2fbeb9ca0ca46411bab926a64295b989
DIST wine-staging-1.9.19.tar.gz 9969031 SHA256 2060ba8f26512fc2104d1d15b7d36136d55e600c9576bc6d747e610e1f3d28d9 SHA512 a0c47b46102d66ae040199aae9fe6dc8cb3986f79dcc32faeb1638e747ad92bfbee337290801c6372177b1a36c4f511ae3af7668730e0f526dfa5d4d64bcfe55 WHIRLPOOL 37fd27c8eea783c24d2f9736f9f90fa29e7796e7f86ffd7dfedb18375c3421f055f4f5685cbe24f83b907bfdc6de562860a15c01f0c9fc1f289640749cb25d11
DIST wine-staging-1.9.20.tar.gz 9979675 SHA256 201506a3e58fd46b590cfc2f9f70d2e3ba6d3bcff5640da135cee9118e71babc SHA512 025760f9a4e0b94264da54b255be4932076535b6a1510121d8019c8fb8edf33768b23575e321ab9715a8186a7f4b7e4cd7aa573ed1af4c3ea7c919b7287ce42b WHIRLPOOL 93b9274c10f74f1e4b9c290a4055fc55ee2391f0eb9a0c1b18e4e54266f8d6e04e0a3d8cc9376d2d871e3d1d15942521ea9a6ad1c91d9801c117a0397edcafbf
DIST wine-staging-1.9.21.tar.gz 10007408 SHA256 88fd8263ba3c13c18423298c49a83d8922e5b45b4797edcd8723aa5d855ce84f SHA512 4144c7f485ac57573b9ab17d3eff307c8343b9226ddc156538a3d6ae141f7c9d9515276ee3f4dfaba388b8dee6579c382861a87883ab92638907b663fcd1e3e7 WHIRLPOOL 5b2a1893e03537c66de6c9296aa54cd0afc515f2a8cb9180c805dc2318a20c51a7efa659880af70150acd053815d27c5293a70cffbb8b5e10a7f3cb723c183f1
DIST wine-staging-1.9.22.tar.gz 10034259 SHA256 1bd7a9a01aec4f2887bbb6df53883a44b9ff39afcaa36b4206c17bf985c245e0 SHA512 e2521b7a891ddb0c00e8edf511cfc0457abcd68123e0a12cc86a92c530ceabd97bd703801980371bb2c80df8b9a82f08028c11c9238767b32d0bfdf98214f4a6 WHIRLPOOL 0f5378a26383a8a94dbe573381e717a4f036e612afe35be1f101c15cadb7ed4c2a7982cc0f25b4f36bd26f05914a6432c682d0a6a049d5a46120e313b4c038c3
DIST wine-staging-1.9.23.tar.gz 10050058 SHA256 155c4a3c46e0924890a84e8182638658c571ddf26c905bc465dd364145df1c84 SHA512 415356682c10a79111b832b379f4d5ab8dd7cb7ae47044247d1c567f8dc652ace52714d9aa322b12e843150e45f5b6850e16c2c2c2a68c9552a8d8759d4d2d42 WHIRLPOOL 291ed389b3b65e38c40db3cf0fb2727775cb4b85336bdebb78d1e33bd7a9afb366a9d6e752e1896a5384d6fc0a0ca11de3e663c9f48fd4273c7a318f6b358435
DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10 WHIRLPOOL 692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
DIST wine-staging-1.9.6.tar.gz 9959130 SHA256 e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9 SHA512 508b5cd553a8b4a293e9250af670de693992c6f6e71e9e3759408b1e8745985030fbcb78c83ae6669e73e48caf95c3a6f0c92da0a96791912d7e6c4d29a26bd2 WHIRLPOOL 2ebc3ca7ea38d2fda310567083f28b76c4f0120dce659152ccacf95eb07de3dfe8950eb9b306b1a91b30ded8e3914f5852f7928e735659c2b02eb50d82fe0fca

@ -485,8 +485,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -491,8 +491,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -491,8 +491,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -490,8 +490,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -489,8 +489,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -509,8 +509,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -509,8 +509,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -509,8 +509,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -508,8 +508,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -510,8 +510,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -510,8 +510,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -0,0 +1,558 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
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"
PLOCALE_BACKUP="en"
inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MAJOR_V=$(get_version_component_range 1-2)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
VANILLA_GV="2.47"
VANILLA_MV="4.6.3"
STAGING_GV="2.47"
STAGING_MV="4.6.3"
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
D3D9_P="wine-d3d9-${PV}"
D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
!staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
)
staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
)
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )
d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
osmesa? ( opengl )
pipelight? ( staging )
s3tc? ( staging )
test? ( abi_x86_32 )
themes? ( staging )
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
d3d9? (
media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
)
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
)
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
themes? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
)
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
)
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-db-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-opengl-20140508-r1
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-sdl-20140508-r1
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-soundlibs-20140508
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-xlibs-20140508
)"
RDEPEND="${COMMON_DEPEND}
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
)
pulseaudio? (
realtime? ( sys-auth/rtkit )
)
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25[winbind] )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
sys-devel/flex
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
xinerama? ( x11-proto/xineramaproto )"
# 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"
wine_compiler_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
ebegin "Checking for gcc-5 ms_abi compiler bug"
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
( "${T}"/pr66838 || false ) >/dev/null 2>&1
if ! eend $?; then
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/549768"
eerror
return 1
fi
fi
# bug #574044
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
if ! eend $?; then
eerror "Wine cannot be built with this version of gcc-5.3"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/574044"
eerror
return 1
fi
fi
fi
# Ensure compiler support
if use abi_x86_64; then
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
if ! eend $?; then
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
eerror
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
eerror
return 1
fi
fi
}
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
wine_env_vcs_vars() {
local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
local pn_live_val="${pn_live_var}"
eval pn_live_val='$'${pn_live_val}
if [[ ! -z ${pn_live_val} ]]; then
if use staging || use d3d9; then
eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
eerror "cannot be used to set the commit. Instead, you may use the"
eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
eerror
return 1
fi
fi
if [[ ! -z ${EGIT_COMMIT} ]]; then
eerror "Commits must now be specified using the environmental variables"
eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
eerror
return 1
fi
}
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
# Verify OSS support
if use oss && ! use kernel_FreeBSD; then
if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
fi
}
pkg_setup() {
wine_build_environment_check || die
wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
else
GV=${STAGING_GV}
MV=${STAGING_MV}
fi
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
local CURRENT_WINE_COMMIT=${EGIT_VERSION}
git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
default
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
ewarn "Wine bugzilla should explicitly state that staging was used."
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $? || die "Failed to apply Wine-Staging patches"
# To differentiate unofficial staging releases
if [[ ! -z ${SUFFIX} ]]; then
sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
fi
fi
if use d3d9; then
if use staging; then
PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
else
PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
fi
PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
fi
default
eautoreconf
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--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 ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
use staging && myconf+=(
--with-xattr
$(use_with themes gtk3)
$(use_with vaapi va)
)
use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && 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 # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
# Remove wineconsole if neither backend is installed #551124
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
if ! use gecko; then
ewarn "Without Wine Gecko, wine prefixes will not have a default"
ewarn "implementation of iexplore. Many older windows applications"
ewarn "rely upon the existence of an iexplore implementation, so"
ewarn "you will likely need to install an external one, like via winetricks"
fi
if ! use mono; then
ewarn "Without Wine Mono, wine prefixes will not have a default"
ewarn "implementation of .NET. Many windows applications rely upon"
ewarn "the existence of a .NET implementation, so you will likely need"
ewarn "to install an external one, like via winetricks"
fi
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -0,0 +1,558 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
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"
PLOCALE_BACKUP="en"
inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MAJOR_V=$(get_version_component_range 1-2)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
VANILLA_GV="2.47"
VANILLA_MV="4.6.3"
STAGING_GV="2.47"
STAGING_MV="4.6.3"
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
D3D9_P="wine-d3d9-${PV}"
D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
!staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
)
staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
)
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )
d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
osmesa? ( opengl )
pipelight? ( staging )
s3tc? ( staging )
test? ( abi_x86_32 )
themes? ( staging )
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
d3d9? (
media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
)
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
)
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
themes? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
)
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
)
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-db-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-opengl-20140508-r1
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-sdl-20140508-r1
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-soundlibs-20140508
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-xlibs-20140508
)"
RDEPEND="${COMMON_DEPEND}
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
)
pulseaudio? (
realtime? ( sys-auth/rtkit )
)
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25[winbind] )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
sys-devel/flex
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
xinerama? ( x11-proto/xineramaproto )"
# 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"
wine_compiler_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
ebegin "Checking for gcc-5 ms_abi compiler bug"
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
( "${T}"/pr66838 || false ) >/dev/null 2>&1
if ! eend $?; then
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/549768"
eerror
return 1
fi
fi
# bug #574044
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
if ! eend $?; then
eerror "Wine cannot be built with this version of gcc-5.3"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/574044"
eerror
return 1
fi
fi
fi
# Ensure compiler support
if use abi_x86_64; then
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
if ! eend $?; then
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
eerror
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
eerror
return 1
fi
fi
}
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
wine_env_vcs_vars() {
local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
local pn_live_val="${pn_live_var}"
eval pn_live_val='$'${pn_live_val}
if [[ ! -z ${pn_live_val} ]]; then
if use staging || use d3d9; then
eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
eerror "cannot be used to set the commit. Instead, you may use the"
eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
eerror
return 1
fi
fi
if [[ ! -z ${EGIT_COMMIT} ]]; then
eerror "Commits must now be specified using the environmental variables"
eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
eerror
return 1
fi
}
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
# Verify OSS support
if use oss && ! use kernel_FreeBSD; then
if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
fi
}
pkg_setup() {
wine_build_environment_check || die
wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
else
GV=${STAGING_GV}
MV=${STAGING_MV}
fi
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
local CURRENT_WINE_COMMIT=${EGIT_VERSION}
git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
default
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
ewarn "Wine bugzilla should explicitly state that staging was used."
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $? || die "Failed to apply Wine-Staging patches"
# To differentiate unofficial staging releases
if [[ ! -z ${SUFFIX} ]]; then
sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
fi
fi
if use d3d9; then
if use staging; then
PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
else
PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
fi
PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
fi
default
eautoreconf
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--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 ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
use staging && myconf+=(
--with-xattr
$(use_with themes gtk3)
$(use_with vaapi va)
)
use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && 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 # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
# Remove wineconsole if neither backend is installed #551124
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
if ! use gecko; then
ewarn "Without Wine Gecko, wine prefixes will not have a default"
ewarn "implementation of iexplore. Many older windows applications"
ewarn "rely upon the existence of an iexplore implementation, so"
ewarn "you will likely need to install an external one, like via winetricks"
fi
if ! use mono; then
ewarn "Without Wine Mono, wine prefixes will not have a default"
ewarn "implementation of .NET. Many windows applications rely upon"
ewarn "the existence of a .NET implementation, so you will likely need"
ewarn "to install an external one, like via winetricks"
fi
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -0,0 +1,558 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
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"
PLOCALE_BACKUP="en"
inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MAJOR_V=$(get_version_component_range 1-2)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
VANILLA_GV="2.47"
VANILLA_MV="4.6.3"
STAGING_GV="2.47"
STAGING_MV="4.6.3"
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
D3D9_P="wine-d3d9-${PV}"
D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
!staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
)
staging? (
gecko? (
abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
)
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )
d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
osmesa? ( opengl )
pipelight? ( staging )
s3tc? ( staging )
test? ( abi_x86_32 )
themes? ( staging )
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
)
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
d3d9? (
media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
)
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
)
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
)
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
themes? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
)
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
)
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-baselibs-20140508-r14
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-db-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-medialibs-20140508-r6
!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-opengl-20140508-r1
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-sdl-20140508-r1
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-soundlibs-20140508
!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
!<app-emulation/emul-linux-x86-xlibs-20140508
)"
RDEPEND="${COMMON_DEPEND}
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
)
pulseaudio? (
realtime? ( sys-auth/rtkit )
)
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25[winbind] )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
sys-devel/flex
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
xinerama? ( x11-proto/xineramaproto )"
# 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"
wine_compiler_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
ebegin "Checking for gcc-5 ms_abi compiler bug"
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
( "${T}"/pr66838 || false ) >/dev/null 2>&1
if ! eend $?; then
eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/549768"
eerror
return 1
fi
fi
# bug #574044
if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
ebegin "Checking for gcc-5-3 stack realignment compiler bug"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
if ! eend $?; then
eerror "Wine cannot be built with this version of gcc-5.3"
eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
eerror "or use gcc-config to select a different compiler version."
eerror "See https://bugs.gentoo.org/574044"
eerror
return 1
fi
fi
fi
# Ensure compiler support
if use abi_x86_64; then
ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
if ! eend $?; then
eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
eerror
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
eerror
return 1
fi
fi
}
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
wine_env_vcs_vars() {
local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
local pn_live_val="${pn_live_var}"
eval pn_live_val='$'${pn_live_val}
if [[ ! -z ${pn_live_val} ]]; then
if use staging || use d3d9; then
eerror "Because of the multi-repo nature of ${PN}, ${pn_live_var}"
eerror "cannot be used to set the commit. Instead, you may use the"
eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
eerror
return 1
fi
fi
if [[ ! -z ${EGIT_COMMIT} ]]; then
eerror "Commits must now be specified using the environmental variables"
eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
eerror
return 1
fi
}
pkg_pretend() {
wine_compiler_check || die
wine_build_environment_check || die
# Verify OSS support
if use oss && ! use kernel_FreeBSD; then
if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
fi
}
pkg_setup() {
wine_build_environment_check || die
wine_env_vcs_vars || die
if ! use staging; then
GV=${VANILLA_GV}
MV=${VANILLA_MV}
else
GV=${STAGING_GV}
MV=${STAGING_MV}
fi
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
if use staging; then
local CURRENT_WINE_COMMIT=${EGIT_VERSION}
git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
fi
fi
if use d3d9; then
git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
fi
default
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
ewarn "Wine bugzilla should explicitly state that staging was used."
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $? || die "Failed to apply Wine-Staging patches"
# To differentiate unofficial staging releases
if [[ ! -z ${SUFFIX} ]]; then
sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
fi
fi
if use d3d9; then
if use staging; then
PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
else
PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
fi
PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
fi
default
eautoreconf
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' loader/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--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 ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
use staging && myconf+=(
--with-xattr
$(use_with themes gtk3)
$(use_with vaapi va)
)
use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && 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 # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
# Remove wineconsole if neither backend is installed #551124
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
if ! use gecko; then
ewarn "Without Wine Gecko, wine prefixes will not have a default"
ewarn "implementation of iexplore. Many older windows applications"
ewarn "rely upon the existence of an iexplore implementation, so"
ewarn "you will likely need to install an external one, like via winetricks"
fi
if ! use mono; then
ewarn "Without Wine Mono, wine prefixes will not have a default"
ewarn "implementation of .NET. Many windows applications rely upon"
ewarn "the existence of a .NET implementation, so you will likely need"
ewarn "to install an external one, like via winetricks"
fi
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -488,8 +488,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -490,8 +490,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -487,8 +487,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -487,8 +487,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -487,8 +487,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -509,8 +509,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -510,8 +510,10 @@ multilib_src_install_all() {
if ! use X && ! use ncurses; then
rm "${D}"/usr/bin/wineconsole* || die
rm "${D}"/usr/share/man/man1/wineconsole* || die
use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
rm_wineconsole() {
rm "${D}usr/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
}
multilib_foreach_abi rm_wineconsole
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055

@ -1 +0,0 @@
DIST basenji-1.0.0.tar.gz 642763 SHA256 1a52c351a84ffe05801f1f440bfc9dbf4523136fad0da40d928e6e354c727c1e SHA512 9448545f345138cdef39f872a8bbd60d60a6e8f49a7ea518d58fa69c6711c5ca019d1d0257e26b80b95d5fe12d787ab9b2ed4bf5a76e4f6acccd904cc6fa6084 WHIRLPOOL 315ea82274acbb7e98ac44407fd10fa377940db7b47f37c54ad11806b2e7e0cc1a40568b12bb805316fb2d91cd550a568d305d9072194a7b5d94c392f8b28319

@ -1,44 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit multilib versionator
DESCRIPTION="Basenji is a volume indexing tool designed for easy and fast indexing of volume collections"
HOMEPAGE="https://launchpad.net/basenji"
SRC_URI="https://launchpad.net/basenji/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
CDEPEND="dev-dotnet/dbus-sharp:1.0
dev-dotnet/dbus-sharp-glib:1.0
dev-dotnet/gio-sharp
dev-dotnet/gtk-sharp
dev-dotnet/gnome-sharp
dev-dotnet/taglib-sharp
media-libs/libextractor"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
dev-dotnet/gnome-desktop-sharp
sys-fs/udisks"
S="${WORKDIR}"
src_prepare() {
sed -i -e "s/-pkg:mono-cairo/-r:Mono.Cairo/" Basenji/Makefile || die "sed failed."
}
src_configure() {
./configure --prefix="${EPREFIX}/usr"
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed"
}

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
Basenji is a volume indexing tool designed for easy and fast indexing of volume collections. It currently supports indexing of removable media such as CDs and USB sticks and stores them as volume objects in a database. After being stored in this database, volumes can be browsed and searched trough for specific files very quickly.
</longdescription>
<use>
</use>
<upstream>
<remote-id type="launchpad">basenji</remote-id>
</upstream>
</pkgmetadata>

@ -3,7 +3,7 @@
# $Id$
EAPI=6
PYTHON_COMPAT=(python{2_7,3_4})
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1

@ -1 +0,0 @@
DIST roadnav-0.19.tar.gz 1289497 SHA256 6354600e10ec6be17a8f7c0282a11e80b1ad6cb4e59c979dd7e336ffcc22143e SHA512 981b7d0b506c977b5c882c7d815566450966de969f46b6ecd7deb10f418d09630e90cc12f308924d7453c3a44f7317d8e91d6b3706ecebe76a97dc62adf44b45 WHIRLPOOL cf613b7003b9800ffb89986e0dbd3496596ca7789946931a97fc749c10b03d2f44a88aa4db39e15c49559afcfda7a076a39b21817bd387aa80bd4be5b240c608

@ -1,26 +0,0 @@
diff --git a/src/GPSInterface_Serial.cpp b/src/GPSInterface_Serial.cpp
index c3e9435..fcae209 100644
--- a/src/GPSInterface_Serial.cpp
+++ b/src/GPSInterface_Serial.cpp
@@ -243,7 +243,7 @@ IGPSInterface::EGPSStatus GPSInterface_Serial::GetData(wxGPSEvent * pGPSEvent)
// Echo DeLorme Tripmate's and Earthmate's hello message
LibRoadnavDebug1(wxT("SerialIO"), wxT("Echoing hello message: %s"), strSentence.c_str());
- sprintf(szOut, "%s\r\n", strSentence.mb_str(*wxConvCurrent));
+ sprintf(szOut, "%s\r\n", static_cast<const char *>(strSentence.mb_str(*wxConvCurrent)));
WriteSerial(szOut);
}
else if (!VerifyGPSChecksum(strSentence)) // check NMEA validity
diff --git a/src/TTS_Festival.cpp b/src/TTS_Festival.cpp
index 8623cb3..2950490 100644
--- a/src/TTS_Festival.cpp
+++ b/src/TTS_Festival.cpp
@@ -88,7 +88,7 @@ ITTS::ETTSStatus TTS_Festival::Speak(const wxString & strText)
ppszArgs[2],
64 + strText.Length(),
wxT("echo \\(SayText \\\"%ss\\\"\\) | festival"),
- strText.mb_str(*wxConvCurrent)
+ static_cast<const char *>(strText.mb_str(*wxConvCurrent))
);
wxExecute(ppszArgs, wxEXEC_SYNC);

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>andrew.cremins@gmail.com</email>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="festival">Enable support for
<pkg>app-accessibility/festival</pkg></flag>
<flag name="openstreetmap">Enable openstreetmap support</flag>
<flag name="scripting">Enable scripting support</flag>
</use>
<upstream>
<remote-id type="sourceforge">roadnav</remote-id>
</upstream>
</pkgmetadata>

@ -1,59 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
WX_GTK_VER=2.8
inherit eutils wxwidgets
DESCRIPTION="Roadnav is a street map application with routing and GPS support"
HOMEPAGE="http://roadnav.sourceforge.net"
SRC_URI="mirror://sourceforge/roadnav/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gps festival openstreetmap scripting" #flite, see bug #516426
DEPEND="
x11-libs/wxGTK:2.8[X]
~dev-libs/libroadnav-${PV}
festival? ( app-accessibility/festival )
gps? ( sci-geosciences/gpsd )
"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc45.patch
}
src_configure() {
econf \
$(use_enable festival) \
$(use_enable gps gpsd) \
$(use_enable openstreetmap) \
$(use_enable scripting) \
--disable-flite \
--with-wx-config=${WX_CONFIG}
}
src_install() {
default
# generic or empty
for f in NEWS COPYING INSTALL; do
rm -f "${D}"/usr/share/doc/${PN}/${f}
done
# --docdir is broken and hardcoded to ${PN}
mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${P}
domenu "${S}"/roadnav.desktop
}
pkg_postinst() {
echo
elog "After upgrading to ${P} you will need to recompile your maps."
echo
}

@ -1 +1,2 @@
DIST trash-cli-0.12.9.14.tar.gz 62090 SHA256 e0371b28324188d4936cbeea7c74f85a28306588c1ad15b5d3af33372bd5eb11 SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c WHIRLPOOL ee9bb75ca3b3b9f141777a581862b57dd12db38490761dc2cd429ec60eca972292b207063615d8a2c233dd613772fb65a7c6faaadd925410ce9f964b10a8e445
DIST trash-cli-0.16.12.29.tar.gz 66826 SHA256 b891b6a5d1b7242b1402cb227f52faf638c2b5ce673925e1221236b4d95bd3f6 SHA512 a8a94205233ac600a98324b95829d1f00debaca95c85c51fa12f7a65ae6f24fda58370d8fe0095bf33327cbddae7dfb02c2587efffd2d7c206c7f7cb0a59953e WHIRLPOOL 0d2d6531430c846d1b28e3b27767d9e1a75e8bc4402023d9ddd44a56b88e89ea92529a8815a3158dceceaeb08c8aca2eb5cae20402c8197c1bab27b4ebb1ffff

@ -0,0 +1,20 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="Python scripts to manipulate trash cans via the command line"
HOMEPAGE="https://github.com/andreafrancia/trash-cli"
SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -1 +0,0 @@
DIST liborange-0.4.tar.gz 330089 SHA256 023fc4ecdd4e775023b89d8fea37918ed8ba55012578e4f7ac0ec3cd1e843fbe SHA512 62ac6687c7d6bfd12d6adce5eecdf9388f719c65127bda3ba8e54750cc8bc8e239286859fcbeed7acdce866f32793e3aabbe943c08f1403b5863300c817772b2 WHIRLPOOL 9cc179e000d9620136e725f07d64bd45942c24fa74d4c735becb35803b1d6090f488ae09dbbdee645cd113a40c79bcaade4e4a517c883d222b6c4408e71b75d5

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
Orange is a tool and library for squeezing out juicy installable Microsoft
Cabinet Files from self-extracting installers for Microsoft Windows
</longdescription>
<upstream>
<remote-id type="sourceforge">synce</remote-id>
</upstream>
</pkgmetadata>

@ -1,37 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
MY_P=lib${P}
DESCRIPTION="A tool and library for extracting cabs from executable installers"
HOMEPAGE="https://sourceforge.net/projects/synce/"
SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
RDEPEND="app-pda/synce-core
>=app-pda/dynamite-0.1.1
>=app-arch/unshield-0.6
sys-apps/file
sys-libs/zlib"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
DOCS="ChangeLog TODO"
src_configure() {
econf $(use_enable static-libs static)
}
src_install() {
default
find "${ED}" -name '*.la' -exec rm -f {} +
}

@ -1 +0,0 @@
DIST synce-core-0.16.tar.gz 703275 SHA256 e1b120bbbc9728b43ff4d3c82f521dd0e55560356c9e2ce2f059cc5f44edd641 SHA512 eb5fc6743ea77ff8e27b5e96300a120a78510be16ba846b20ec0c99e3e969d4af649566e46addb0e3a88da875639e6b150a7cda8dcee706235fe9103f9ffe8ff WHIRLPOOL 226a581e7abbd7c4d0631fd31a4203678f6ea8bbe15c42a88bfed03898deb19edc9a25c68f9d906e7a53c62f6a7d2ad26f4030b80e7202aebf47b5add3ec4a86

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">synce</remote-id>
</upstream>
</pkgmetadata>

@ -1,79 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
PYTHON_DEPEND="python? 2:2.7"
inherit flag-o-matic python
DESCRIPTION="Base libraries, including RAPI protocol, tools and dccm daemon"
HOMEPAGE="https://sourceforge.net/projects/synce/"
SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="python static-libs"
# AC_PATH_PROG -> pppd -> net-dialup/ppp
# AC_PATH_PROG -> ifconfig -> sys-apps/net-tools
RDEPEND="!app-pda/synce-connector
>=dev-libs/dbus-glib-0.100
>=dev-libs/glib-2.28
!dev-libs/librapi2
!dev-libs/libsynce
net-dialup/ppp
sys-apps/net-tools
virtual/libgudev
virtual/udev
python? (
>=dev-python/pyrex-0.9.6
dev-python/python-gudev
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
if use python; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
# AC_PATH_PROG -> dhclient ->
local dhclient=true
type -P dhclient >/dev/null && dhclient=dhclient
sed -i -e "s:dhclient:${dhclient}:" configure || die
use python && python_convert_shebangs -r 2 .
}
src_configure() {
append-cflags -fno-strict-aliasing
# hal OR udev -> udev -> dbus -> build all of bluetooth, odccm, udev
econf \
$(use_enable static-libs static) \
--enable-dccm-file-support \
--enable-odccm-support \
--disable-hal-support \
--enable-udev-support \
--enable-bluetooth-support \
$(use_enable python python-bindings)
}
src_install() {
emake DESTDIR="${D}" install
dodoc BUGS ChangeLog README* TODO
newdoc bluetooth/README README.bluetooth
# prune_libtool_files() from eutils.eclass fails wrt #421197
find "${ED}" -name '*.la' -exec rm -f {} +
# Always remove static archive from site-packages
use static-libs && find "${ED}" -name pyrapi2.a -exec rm -f {} +
}

@ -3,4 +3,6 @@ DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83
DIST zsh-5.2-doc.tar.xz 3108600 SHA256 328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a SHA512 a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0 WHIRLPOOL a6b023af9e3d94d31b56aba688c2bf3c16ff6ed1dc9db34dd970c4bf0461e24b7aab0b9113cc5f16bd87ab2ca9d973a990a3721c08500cbcd45fa2fe2d43a260
DIST zsh-5.2.tar.xz 2820108 SHA256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d SHA512 9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72 WHIRLPOOL 5348ce11026a4e50d0ecf118cb379e9765cb98fcf32563489fd860ad0234c3f3aefb7f3fe28d18a97f2ddba54dc2b2cf9909b81cdc0e213f26f599ba68fd8833
DIST zsh-5.3-doc.tar.xz 3161944 SHA256 cdfc6c3f7235b13308af5316cfa87abb5f51b3ec72d45f9043fde6e5b2e8663e SHA512 29d5731d48170e7bc96337e9ae10f58a9f6fcd7698b4dcaacf17b9e490c8084cb781fc3d9a06ddcaddb9d3957b86d9040cc8e7b13d4b5649e2be181508a95ef4 WHIRLPOOL caf5ef406d7bc616ddd1eeecfd5ed95fa560a49d914059a225569cae63be8c92bd01a88fce4314fb6272218f189c09196bcb3c5a72f737257c7d0263251ad2f1
DIST zsh-5.3.1-doc.tar.xz 3161408 SHA256 d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c WHIRLPOOL 40d10cf9767a168f2619b0bed947d6a05a45bece6a5a5bd353422fef88ca267bf2f03f18f6ce9ee86def9219b13e3c8fa145f73c22bb3f9d786ee6eddd773953
DIST zsh-5.3.1.tar.xz 2928832 SHA256 fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304 WHIRLPOOL cdd62b5c144a7b416bb46b7a14ddc12f5e1ff133acc292abcdc94d402b2c0a6b57667f962cb808bdd52fdedd4b98fb5669327d1754183f242f29bdaea73747fc
DIST zsh-5.3.tar.xz 2928684 SHA256 76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a SHA512 b34da1a062954ccb166b0a22fa48b0d08bdb8f50fd96cb391f04887c0bf416e771ceaa8af8fa7da2dc2e6f7c3ecce5c92c4e3bee21fd93e467849c8febc021b0 WHIRLPOOL 9d52e36528c2272e2de33144bd76ddb50e505ecc2dec13e332c9e9185be1e919b5f4276de052b0d558d5f809c0437d1a85491924a6febd143dcfced53c323c81

@ -0,0 +1,218 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit flag-o-matic prefix
if [[ ${PV} == 9999* ]] ; then
inherit git-r3 autotools
EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
fi
DESCRIPTION="UNIX Shell similar to the Korn shell"
HOMEPAGE="http://www.zsh.org/"
LICENSE="ZSH gdbm? ( GPL-2 )"
SLOT="0"
IUSE="caps debug doc examples gdbm maildir pcre static unicode"
RDEPEND="
>=sys-libs/ncurses-5.1:0=
static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
caps? ( sys-libs/libcap )
pcre? (
>=dev-libs/libpcre-3.9
static? ( >=dev-libs/libpcre-3.9[static-libs] )
)
gdbm? ( sys-libs/gdbm )
"
DEPEND="sys-apps/groff
${RDEPEND}"
PDEPEND="
examples? ( app-doc/zsh-lovers )
"
if [[ ${PV} == 9999* ]] ; then
DEPEND+=" app-text/yodl
doc? (
sys-apps/texinfo
app-text/texi2html
virtual/latex-base
)"
fi
src_prepare() {
if [[ ${PV} != 9999* ]]; then
# fix zshall problem with soelim
ln -s Doc man1 || die
mv Doc/zshall.1 Doc/zshall.1.soelim || die
soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
# add openrc specific options for init.d completion
eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
fi
cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
eprefixify "${T}"/zprofile || die
if use prefix ; then
sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
else
sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
fi
eapply_user
if [[ ${PV} == 9999* ]] ; then
sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
eautoreconf
fi
}
src_configure() {
local myconf=()
if use static ; then
myconf+=( --disable-dynamic )
append-ldflags -static
fi
if use debug ; then
myconf+=(
--enable-zsh-debug
--enable-zsh-mem-debug
--enable-zsh-mem-warning
--enable-zsh-secure-free
--enable-zsh-hash-debug
)
fi
if [[ ${CHOST} == *-darwin* ]]; then
myconf+=( --enable-libs=-liconv )
append-ldflags -Wl,-x
fi
econf \
--bindir="${EPREFIX}"/bin \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--enable-etcdir="${EPREFIX}"/etc/zsh \
--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
--enable-function-subdirs \
--with-tcsetpgrp \
$(use_enable maildir maildir-support) \
$(use_enable pcre) \
$(use_enable caps cap) \
$(use_enable unicode multibyte) \
$(use_enable gdbm ) \
"${myconf[@]}"
if use static ; then
# compile all modules statically, see Bug #27392
# removed cap and curses because linking failes
sed -e "s,link=no,link=static,g" \
-e "/^name=zsh\/cap/s,link=static,link=no," \
-e "/^name=zsh\/curses/s,link=static,link=no," \
-i "${S}"/config.modules || die
if ! use gdbm ; then
sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
"${S}"/config.modules || die
fi
fi
}
src_compile() {
default
if [[ ${PV} == 9999* ]] && use doc ; then
emake -C Doc everything
fi
}
src_test() {
addpredict /dev/ptmx
local i
for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
rm "${S}"/Test/${i} || die
done
emake check
}
src_install() {
emake DESTDIR="${D}" install $(usex doc "install.info" "")
insinto /etc/zsh
doins "${T}"/zprofile
keepdir /usr/share/zsh/site-functions
insinto /usr/share/zsh/${PV%_*}/functions/Prompts
newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
local i
# install miscellaneous scripts (bug #54520)
sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-i {Util,Misc}/* || die
for i in Util Misc ; do
insinto /usr/share/zsh/${PV%_*}/${i}
doins ${i}/*
done
# install header files (bug #538684)
insinto /usr/include/zsh
doins config.h Src/*.epro
for i in Src/{zsh.mdh,*.h} ; do
sed -e 's@\.\./config\.h@config.h@' \
-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-i "${i}"
doins "${i}"
done
dodoc ChangeLog* META-FAQ NEWS README config.modules
if use doc ; then
pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
docinto html
dodoc Doc/*.html
insinto /usr/share/doc/${PF}
doins Doc/zsh.{dvi,pdf}
popd >/dev/null
fi
docinto StartupFiles
dodoc StartupFiles/z*
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
echo
elog "If you want to enable Portage completions and Gentoo prompt,"
elog "emerge app-shells/gentoo-zsh-completions and add"
elog " autoload -U compinit promptinit"
elog " compinit"
elog " promptinit; prompt gentoo"
elog "to your ~/.zshrc"
echo
elog "Also, if you want to enable cache for the completions, add"
elog " zstyle ':completion::complete:*' use-cache 1"
elog "to your ~/.zshrc"
echo
elog "Note that a system zprofile startup file is installed. This will override"
elog "PATH and possibly other variables that a user may set in ~/.zshenv."
elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
elog "or other user startup files that are sourced after the system zprofile."
echo
elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
elog "one method is to use a separate path-setting file that is conditionally sourced"
elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
echo
elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
echo
fi
}

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
inherit toolchain-funcs
DESCRIPTION="ASA Carriage control conversion for ouput by Fortran programs"
HOMEPAGE="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
SRC_URI="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
dobin asa
doman asa.1
dodoc README asa.dat
}

@ -1,8 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
</pkgmetadata>
<pkgmetadata/>

@ -1,2 +1 @@
DIST writerperfect-0.9.2.tar.xz 274760 SHA256 e4040ec20436d5a763632243787bbb86cffd82ddf0da6aa674827e0401c2b601 SHA512 07679176c9c3f159c177cae65d499550f5cf86b34af26d32fb1d445176a3a8ff773c48b677cbbaa3514b81f5c5e83a358f8ba1ab0b567e182aeb05d8a4fc8bcb WHIRLPOOL 5bee7d9ac16ff74e2c70093a629ae0d417e7e3cd71b7a78bbdb5f62c1d9a7ea46962ba0816742b38937d3b2907d9b7a6f888c95e4da20e7bc4f736702a844dcf
DIST writerperfect-0.9.5.tar.xz 302176 SHA256 aa01122659482627f9adcff91bb242c37092c7f8537bfa5dc44e1a3c89aad9e2 SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc WHIRLPOOL 9034673daad0929348f71fde157245126e73caf46db8279bfddd2b01e4ab5a72e67eb9a6dd34fa13c9f9848a693f2440d33852d51126204c5e8c1fa8dd760031

@ -1,55 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
DESCRIPTION="Various formats to Open document format converter"
HOMEPAGE="http://libwpd.sf.net"
SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
# FIXME: libepubgen
RDEPEND="
=app-text/libodfgen-0.1*
>=dev-libs/librevenge-0.0.1
abiword? ( =app-text/libabw-0.1* )
cdr? ( =media-libs/libcdr-0.1* )
ebook? ( =app-text/libebook-0.1* )
freehand? ( =media-libs/libfreehand-0.1* )
gsf? ( gnome-extra/libgsf )
keynote? ( =app-text/libetonyek-0.1* )
mspub? ( =app-text/libmspub-0.1* )
mwaw? ( =app-text/libmwaw-0.3* )
pagemaker? ( media-libs/libpagemaker )
visio? ( =media-libs/libvisio-0.1* )
wpd? ( app-text/libwpd:0.10 )
wpg? ( =app-text/libwpg-0.3* )
wps? ( =app-text/libwps-0.3* )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
src_configure() {
econf \
--disable-werror \
$(use_enable debug) \
$(use_with abiword libabw) \
$(use_with cdr libcdr) \
$(use_with ebook libe-book) \
$(use_with freehand libfreehand) \
$(use_with gsf libgsf) \
$(use_with keynote libetonyek) \
$(use_with mspub libmspub) \
$(use_with mwaw libmwaw) \
$(use_with pagemaker libpagemaker) \
$(use_with visio libvisio) \
$(use_with wpd libwpd) \
$(use_with wpg libwpg) \
$(use_with wps libwps)
}

@ -1 +0,0 @@
DIST libgoogle-data-mono-1.4.0.2.tar.gz 2090937 SHA256 761124feb67ad972e61a10a09bbde68536a2fa8cc67f9f17fcda907bbdb2fbe4 SHA512 b64d6f3d066454ece8b7b6c2dd7cb728244ece3298ce226718317521a9eca2ba0273056041991fb1453bd936d81eed411a04d7fb5de9c1b7cab9af659aef2200 WHIRLPOOL 20f075ed3b14a3d22229a115b4e1953b5d2fc790903860f91814a931c476fc3cccd87eef8ad1a083f517a8195397350f0a68ca01f263e56cfc79825f98bd3fc6

@ -1,8 +0,0 @@
--- libgoogle-data-mono-1.4.0.2/misc/gdata-sharp-core.pc.in 2010-03-09 13:07:29.000000000 +0100
+++ libgoogle-data-mono-1.4.0.2.new/misc/gdata-sharp-core.pc.in 2010-03-10 13:11:29.000000000 +0100
@@ -5,4 +5,4 @@ Name: GData Sharp Core
Description: CLI bindings to Google's online services (Core libraries)
Version: 1.4.0.2
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
+Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll

@ -1,39 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=3
inherit mono eutils
MY_PN="libgoogle-data-mono"
DESCRIPTION="C# bindings for the Google GData API"
HOMEPAGE="https://code.google.com/p/google-gdata/"
SRC_URI="https://google-gdata.googlecode.com/files/${MY_PN}-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
# tests are completely broken (bug #310101), revisit in future bumps.
RESTRICT="test"
DEPEND=">=dev-lang/mono-2.0"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
epatch "${FILESDIR}"/pkgconfig-typo-fix.patch
}
src_compile() {
emake PREFIX=/usr || die "compilation failed"
}
src_install() {
# The Makefile has prefix=/usr/local by default :|
emake PREFIX=/usr DESTDIR="${ED}" install || die "installation failed"
}

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
<upstream>
<remote-id type="google-code">google-gdata</remote-id>
</upstream>
</pkgmetadata>

@ -1,2 +0,0 @@
DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74

@ -1,14 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
GTK_SHARP_MODULE_DIR=gtkdotnet
inherit gtk-sharp-module
SLOT="2"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""
RESTRICT="test"

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>dotnet@gentoo.org</email>
<name>Gentoo Dotnet Project</name>
</maintainer>
</pkgmetadata>

@ -1 +0,0 @@
DIST gtk-sharp-beans-2.14.0.tar.gz 21265 SHA256 91fe411ac6889bcf6b70074f3c0dc62de9076a43e804fd7cc2009f8b008dbd6b SHA512 8d4a6c654803ea5ed5c129456041fa8d98ea59997b72e15aca8b936e17677f1c13042f601caee05d1289fe0f78c3d91e7ab9b9a2dffddff2028ff8c278a4aac3 WHIRLPOOL 1d519a76586320369e68850cecb301b8b40c46ffe208d0d355b3784b7d436461a93b7048b51c2ebc94ed32eb92bb729be78a8a9bbf744a436b1d1f854d8cc7b1

@ -1,42 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
inherit autotools mono
DESCRIPTION="GTK+ API C# binding"
HOMEPAGE="https://github.com/mono/gtk-sharp-beans"
SRC_URI="https://github.com/mono/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-dotnet/gio-sharp
>=dev-dotnet/glib-sharp-2.12
>=dev-dotnet/gtk-sharp-2.12
>=dev-dotnet/gtk-sharp-gapi-2.12"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_unpack() {
unpack ${A}
mv *-${PN}-* "${S}"
}
src_prepare() {
eautoreconf
}
src_compile() {
emake -j1 || die
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS NEWS README
mono_multilib_comply
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save