Add USE=samba to force lazy people to upgrade their samba #195621 and auto-install the gecko cab when USE=gecko #197443 by Jacek Caban.

Package-Manager: portage-2.1.4_rc11

4 files changed, 35 insertions, 19 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 1311983a7146..ce2be648a54e 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.199 2007/12/28 19:08:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.200 2007/12/29 11:11:49 vapier Exp $
+
+  29 Dec 2007; Mike Frysinger <vapier@gentoo.org> wine-0.9.52.ebuild:
+  Add USE=samba to force lazy people to upgrade their samba #195621 and
+  auto-install the gecko cab when USE=gecko #197443 by Jacek Caban.
 
 *wine-0.9.52 (28 Dec 2007)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2512edeb0da5..5d5ceca61152 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -136,6 +136,7 @@ DIST wine-0.9.8.tar.bz2 10563571 RMD160 54b44b3733cb1628189830e3e8295efa848af6f1
 DIST wine-0.9.9.tar.bz2 10546298 RMD160 50f53da5a8be9ecdb7a982307952effc4754d5ec SHA1 efdff295b4996873c54e3536b73022dea41af923 SHA256 77c908178705b7b061e0ea759935643465c7591e54f59d2bb3ec7133ce3a51d5
 DIST wine-0.9.tar.bz2 10036834 RMD160 cd330cd0d8bd7010874d7dfd2784611c1d719780 SHA1 d29921bc9d1f3dd3342fb35a8b62de31efa51802 SHA256 3a54ec4e17dce39e2ea6acdd4f9801ff03c78ef27d40cf8165ee5b6b462d0d3b
 DIST wine-20050111-upstream-registry-fix.patch.bz2 13584 RMD160 8240ea3fad134d803795b236d15581d7306a08eb SHA1 9f38426f3954e5f693098973a62ddf2510c953ce SHA256 ba1a47e13d486afbce821b7e97c763e038be1550f86daeaf2e71b8f17b1374a4
+DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 EBUILD wine-0.9.1.ebuild 4029 RMD160 2593cf855bb45f31571689c81f869c57e3948655 SHA1 48f9a82f6691dc7ed4562cabaacb0f86eddb4e9f SHA256 1d6589b483e258c8ae95fa32cef81fa4db21c1c5bff34aa8e8409e3e4ab73921
 MD5 dceb05192bdf4f344ad31c9f3f5114ad wine-0.9.1.ebuild 4029
 RMD160 2593cf855bb45f31571689c81f869c57e3948655 wine-0.9.1.ebuild 4029
@@ -324,10 +325,10 @@ EBUILD wine-0.9.51.ebuild 3355 RMD160 56901884b48ca715cdb61ff90fa23a8cf138b535 S
 MD5 e49b80cd814ae98767084fc5a0e8611d wine-0.9.51.ebuild 3355
 RMD160 56901884b48ca715cdb61ff90fa23a8cf138b535 wine-0.9.51.ebuild 3355
 SHA256 ec90eddbf6d85bda52eeae0e47161fb37b9abc0264bbd20f2e74b016017b804e wine-0.9.51.ebuild 3355
-EBUILD wine-0.9.52.ebuild 3305 RMD160 d58ffea34f53ffa3781c16469f7a006bc795c581 SHA1 f1dd87adf1653e94e5d08ae59cd5cdd52d0c8c22 SHA256 311a235ac79dcb09f166a1fff6f8fda93ba5b265bfb1acbddb2efb56361f1859
-MD5 c0fcf9aab13e762d38171bea99c49678 wine-0.9.52.ebuild 3305
-RMD160 d58ffea34f53ffa3781c16469f7a006bc795c581 wine-0.9.52.ebuild 3305
-SHA256 311a235ac79dcb09f166a1fff6f8fda93ba5b265bfb1acbddb2efb56361f1859 wine-0.9.52.ebuild 3305
+EBUILD wine-0.9.52.ebuild 3526 RMD160 a81c28286820f3d84cebc8de3fa0ad774bf1110a SHA1 c18d233bc0a2e7a352c18c7a4e5eef3921abfb24 SHA256 cb32cf56f224714463a6ea21210f5cabc5c26422af0e133e41f575dce693e31c
+MD5 044609fced1e8dcaec8b8fbdd9dc02c5 wine-0.9.52.ebuild 3526
+RMD160 a81c28286820f3d84cebc8de3fa0ad774bf1110a wine-0.9.52.ebuild 3526
+SHA256 cb32cf56f224714463a6ea21210f5cabc5c26422af0e133e41f575dce693e31c wine-0.9.52.ebuild 3526
 EBUILD wine-0.9.6.ebuild 3992 RMD160 0c62501cc18cf8ff136168c08d9b17b10212010d SHA1 30801571e807b0bf7256397818653d906bd5399a SHA256 b29da96f895c70be8c41c5ba4fac6919d4034b62ed7ef2c5ee0eda71dd417eac
 MD5 2c0eac8aab2a8531c70583e6fb11c924 wine-0.9.6.ebuild 3992
 RMD160 0c62501cc18cf8ff136168c08d9b17b10212010d wine-0.9.6.ebuild 3992
@@ -388,10 +389,10 @@ EBUILD wine-9999.ebuild 3155 RMD160 656c808a5b3b46d61f236abb7d46d12fde9fa030 SHA
 MD5 c66e557289c63602125708f6d34f1c73 wine-9999.ebuild 3155
 RMD160 656c808a5b3b46d61f236abb7d46d12fde9fa030 wine-9999.ebuild 3155
 SHA256 8525b3cba9ec1706c4b25a42e9f3124c077eea2b5bae1ad94ac599409055e1dc wine-9999.ebuild 3155
-MISC ChangeLog 36431 RMD160 76ce5672d7f064b563546ce3f729ec9d71e5f968 SHA1 4892e767c7c12dfc33f127483b35943941cf8a4a SHA256 78a395cc11fa8081bddb928fe660d37728de2002af61e4b31998ead4de5476fe
-MD5 8997eb9c263648abf71c2008f1cc8e2e ChangeLog 36431
-RMD160 76ce5672d7f064b563546ce3f729ec9d71e5f968 ChangeLog 36431
-SHA256 78a395cc11fa8081bddb928fe660d37728de2002af61e4b31998ead4de5476fe ChangeLog 36431
+MISC ChangeLog 36642 RMD160 7a8886095ec5aa10aef70483d7b69ae9350e8de2 SHA1 fe4edf2d5f137e6b9f42fafff4b5967ee405abee SHA256 8731af4b4a6e5931372529cb781c22bb49d492c6d5fe77ebf6336e9f82441a36
+MD5 803a39d1aad2838a308afd9cb7ce63d8 ChangeLog 36642
+RMD160 7a8886095ec5aa10aef70483d7b69ae9350e8de2 ChangeLog 36642
+SHA256 8731af4b4a6e5931372529cb781c22bb49d492c6d5fe77ebf6336e9f82441a36 ChangeLog 36642
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -540,9 +541,9 @@ SHA256 bc16392c62a0658cbc35234082e691eaac61e30dac57dc57d9272c432079ba28 files/di
 MD5 ebdc581d9e12947f3d8c2f4819f69d6d files/digest-wine-0.9.51 244
 RMD160 73069ad629c2ecb9f0c7637d1854a9ad1bcc4394 files/digest-wine-0.9.51 244
 SHA256 c0c277af95b6396f089a8e6aae387799108a81586a0e7c3ef3b45a86867efe6d files/digest-wine-0.9.51 244
-MD5 76166d5cd67d106aea36e88356dba4ad files/digest-wine-0.9.52 244
-RMD160 05d714d4416743951e71e8fb96afd61be4c8ac49 files/digest-wine-0.9.52 244
-SHA256 0e0b4b0436ba88ec09ee983908d6d47eff6fbfb915fe1881152bd15e6cb3a31e files/digest-wine-0.9.52 244
+MD5 a266854191b8625767cce5c9e2cb53d5 files/digest-wine-0.9.52 488
+RMD160 051f91614c0d0b76ed483441c995946b61f38172 files/digest-wine-0.9.52 488
+SHA256 79215b00d633d572d2797358c598c3907e6b22d94fcef35737f68249ea769ac0 files/digest-wine-0.9.52 488
 MD5 039621b36e2a0b7b840dc3afef8e4ecc files/digest-wine-0.9.6 176
 RMD160 90a7659326320ef2e8376baa92631b7ae467040a files/digest-wine-0.9.6 176
 SHA256 4f0182a7f274fd2bf5946730955c0fa04eb51416442f3557e8d08497333216ca files/digest-wine-0.9.6 176
@@ -588,7 +589,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd1SX8ACgkQj9hvisErhMKbxACgreZFIn9fBX2NFnSC1OHpqudv
-q/gAmQG9OoAp8KkRlBarK+R2y4EZEyni
-=sAar
+iEYEARECAAYFAkd2K1cACgkQj9hvisErhMIPgQCgiBTG1Y7dbaaN1TqMVMJIr5hd
+c/YAoKyJmXiFSKh20dzUFnXoseuwtPw3
+=cHVQ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/digest-wine-0.9.52 b/app-emulation/wine/files/digest-wine-0.9.52
index a95c246fda2b..b97191e6d7c3 100644
--- a/app-emulation/wine/files/digest-wine-0.9.52
+++ b/app-emulation/wine/files/digest-wine-0.9.52
@@ -1,3 +1,6 @@
 MD5 c3b14ac84f049a2db28cd41c3f71998b wine-0.9.52.tar.bz2 12966473
 RMD160 686b2b5f4c7aff2167a6710b1b392bc282c3768a wine-0.9.52.tar.bz2 12966473
 SHA256 de3fabb72b69b088ff5c8f769e9478bdc07ff3a247428c660e12ac5cae3b6026 wine-0.9.52.tar.bz2 12966473
+MD5 b188c296f045d20abdb11e9c0564894b wine_gecko-0.1.0.cab 5746895
+RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 wine_gecko-0.1.0.cab 5746895
+SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10 wine_gecko-0.1.0.cab 5746895
diff --git a/app-emulation/wine/wine-0.9.52.ebuild b/app-emulation/wine/wine-0.9.52.ebuild
index 19c64e6d889b..21d45b50238d 100644
--- a/app-emulation/wine/wine-0.9.52.ebuild
+++ b/app-emulation/wine/wine-0.9.52.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.52.ebuild,v 1.1 2007/12/28 19:08:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.52.ebuild,v 1.2 2007/12/29 11:11:49 vapier Exp $
+
+EAPI="1"
 
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.com/"
-SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2
+	gecko? ( mirror://sourceforge/wine/wine_gecko-0.1.0.cab )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -36,6 +39,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	lcms? ( media-libs/lcms )
+	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	>=media-gfx/fontforge-20060703
 	scanner? ( media-gfx/sane-backends )
@@ -115,8 +119,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc ANNOUNCE AUTHORS ChangeLog README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-*.cab || die
+	fi
 }
 
 pkg_postinst() {