sync ebuilds

Package-Manager: portage-2.2_pre5

3 files changed, 54 insertions, 19 deletions

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 790dde892e0d..fc5072cf1f8c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -138,7 +138,7 @@ EBUILD wine-0.9.54.ebuild 3526 RMD160 6c45684db331deb03fc31ff91139966e23bf2269 S
 EBUILD wine-0.9.55.ebuild 3526 RMD160 6e0f55f65f8aa52ce0d980f7d1ea4e193e5618cc SHA1 ee4e2bd9ea41a2e50da766fa36fed483fd53b724 SHA256 ed09df051af43da420b10e7cd4db1ff73390ba5d77b98f9c5a31b208e47d356b
 EBUILD wine-0.9.56.ebuild 3526 RMD160 ba377fb5ea9ec4f56930815fc863099d22f3d5b3 SHA1 d1f733f200289cbc2bd7272212874dccf86e7abf SHA256 c406c87e5735c4deb93e8651018425cec2ba3e2bd9936ecd95943dea61c4bd65
 EBUILD wine-0.9.57.ebuild 3526 RMD160 a7a96a966980ebdc398d305e1e13c20dc5cd023f SHA1 fa5650eaa96d33e76661fd087379fba6bb4ff896 SHA256 15948dbbd1cd4001e6c6e02f4686abecf23fe18e91f9b29ae174285e481f4c6f
-EBUILD wine-0.9.58.ebuild 3526 RMD160 5c8e231bf321f6784649956331d3a8b494867807 SHA1 fbe47ab04036b208ce467ffe9e4330132eadb9cf SHA256 a2f2b3849b4fe4e3938e1633f6b1fbb529388bb172b6cd0e96e2b0e30d258961
+EBUILD wine-0.9.58.ebuild 3746 RMD160 48b04f3f9eb28041698f1d1f8e0870727033bab5 SHA1 dc6a7191cf1821650c9a24cf136ab56757973ab6 SHA256 9181928bdd00c100fcde465aba05ebce99a8270514f0f7bdf11618e84a359fbd
 EBUILD wine-0.9.6.ebuild 3992 RMD160 b06b88ea55725c2dcd78a568f45c7cfd51d12b5f SHA1 206f183cc5fe99fe45af23be51f8de0e966dd813 SHA256 7bb3f6dbce32575a76e744d4dcd9d09c11a78626b53309b44a7654a7eff9969e
 EBUILD wine-0.9.7.ebuild 3579 RMD160 22b671ce0b34c204af331165a2835390d225caa5 SHA1 d4c447720533f099437bf2348c6ae142dc1d8868 SHA256 712cc881cd540b7bbb969412b24bb2cba3f9c5022980e8fbffb66f91c165659d
 EBUILD wine-0.9.8-r1.ebuild 3388 RMD160 34aa8f7662a99fbe47add687b861fb7a5cb0e017 SHA1 02a8b79818ea19d4a615ee2f809aee2ffb8be283 SHA256 93d097f95c70c5236cc2214d4f75c15719a3c6498b50545f5cb53328ea4a43cf
@@ -150,13 +150,13 @@ EBUILD wine-20050628.ebuild 4083 RMD160 4f8c5a9f70dec42cd73a25df5cc0d4e045155421
 EBUILD wine-20050725-r1.ebuild 4133 RMD160 faf107f9c1686f423ace65242a5fb31611a89121 SHA1 f540d1b7ddd249d585d26b637d87a9aa82c2e203 SHA256 54053a77eaae8dc737759a13783fc7da2c0dd80c2dba71bc8741bc69e4b75a14
 EBUILD wine-20050830.ebuild 4117 RMD160 8d1337a7e6986402ed0a6cd00f60789888c68c36 SHA1 924578326248435ac3e9326e35ab4d752a7f8897 SHA256 7189b9d3b69e447ce1cf2af22d58aa6cad4b9f1298f091644482567b6bd829ba
 EBUILD wine-20050930.ebuild 4134 RMD160 5f2b07bec71c6534ff3b005769972babce2fef07 SHA1 0158ee29f2f8beeeef46e5fce1ee8cb7c582fd46 SHA256 d123c1e3db09be04d43e80da1fc594e148c09f0aefc7f4d956e413ee89ab1bc5
-EBUILD wine-9999.ebuild 3156 RMD160 54e5f53b2b6f95817f34e587cda1dbb8bb137525 SHA1 7491a5726a1fdf8830caa4d05c3fde6b3f23106f SHA256 c17d9b56a6ddb3611df422c29da662bdcc54e528177508eb54facacf5e0a8f45
+EBUILD wine-9999.ebuild 3721 RMD160 57824e46ba6ac5a11c9698c8957a5bc0d1211546 SHA1 ece114f6e5ee37a45bac61521da9b0c5349d077e SHA256 3533ffe5bc2b497ede11cb97623d97682184a53e3b229317be109c3cf5b53b14
 MISC ChangeLog 38463 RMD160 3c570a33272ebbedbffc98b841fe1031f7f13678 SHA1 e3cbca6a901930f16359d7108ee574f754f88670 SHA256 88a83cd6c9d8faf8f4f87ec6b1a9764fc0acc9878a593ffd26ee1113ec1242da
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH6+anj9hvisErhMIRArEWAJ4pQgiFmzXksO23ZS8lxaJgtPhhGACaA1GS
-V9rPQqcNeVpg+WMXt+vBjRw=
-=622Z
+iD8DBQFH6+h2j9hvisErhMIRAoAOAKCnZrP7uSBcRxnuV/VhTV6hXAMzIQCg20hV
+aJXcty5qdhDwLFd/R+W6ulk=
+=ziFN
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.58.ebuild b/app-emulation/wine/wine-0.9.58.ebuild
index 65781e0ea2e4..6e63bbb03601 100644
--- a/app-emulation/wine/wine-0.9.58.ebuild
+++ b/app-emulation/wine/wine-0.9.58.ebuild
@@ -1,14 +1,22 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.58.ebuild,v 1.2 2008/03/27 18:22:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.58.ebuild,v 1.3 2008/03/27 18:30:15 vapier Exp $
 
 EAPI="1"
 
 inherit eutils flag-o-matic multilib
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
+fi
+
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
-SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2
+SRC_URI="${SRC_URI}
 	gecko? ( mirror://sourceforge/wine/wine_gecko-0.1.0.cab )"
 
 LICENSE="LGPL-2.1"
@@ -66,7 +74,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack wine-${PV}.tar.bz2
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack wine-${PV}.tar.bz2
+	fi
 	cd "${S}"
 
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
@@ -120,7 +132,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE AUTHORS ChangeLog README
+	dodoc ANNOUNCE AUTHORS ChangeLog DEVELOPERS-HINTS README
 	if use gecko ; then
 		insinto /usr/share/wine/gecko
 		doins "${DISTDIR}"/wine_gecko-*.cab || die
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 80377d0d97e1..68954a756f48 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,19 +1,28 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.23 2008/03/27 18:22:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.24 2008/03/27 18:30:15 vapier Exp $
 
-EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+EAPI="1"
 
-inherit eutils flag-o-matic multilib git
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
+fi
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
-SRC_URI=""
+SRC_URI="${SRC_URI}
+	gecko? ( mirror://sourceforge/wine/wine_gecko-0.1.0.cab )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa arts 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
@@ -23,13 +32,13 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
 	X? (
+		x11-libs/libXcursor
 		x11-libs/libXrandr
 		x11-libs/libXi
 		x11-libs/libXmu
 		x11-libs/libXxf86vm
 		x11-apps/xmessage
 	)
-	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
@@ -38,6 +47,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 )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -55,10 +65,20 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-S=${WORKDIR}/${EGIT_PROJECT}
+pkg_setup() {
+	use alsa || return 0
+	if ! built_with_use --missing true media-libs/alsa-lib midi ; then
+		eerror "You must build media-libs/alsa-lib with USE=midi"
+		die "please re-emerge media-libs/alsa-lib with USE=midi"
+	fi
+}
 
 src_unpack() {
-	git_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack wine-${PV}.tar.bz2
+	fi
 	cd "${S}"
 
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
@@ -80,7 +100,6 @@ config_cache() {
 
 src_compile() {
 	export LDCONFIG=/bin/true
-	use arts    || export ac_cv_path_ARTSCCONFIG=""
 	use esd     || export ac_cv_path_ESDCONFIG=""
 	use scanner || export ac_cv_path_sane_devel="no"
 	config_cache jack jack/jack.h
@@ -112,8 +131,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc ANNOUNCE AUTHORS ChangeLog DEVELOPERS-HINTS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-*.cab || die
+	fi
 }
 
 pkg_postinst() {