Version bump #104492 by Martin Nowack.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 261 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index e626c5e2d38a..e852f92382f3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.103 2005/08/24 00:19:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.104 2005/09/02 00:49:57 vapier Exp $
+
+*wine-20050830 (02 Sep 2005)
+
+  02 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-20050830-gcc-32bit.patch, +files/wine-20050830-no-ldap.patch,
+  +wine-20050830.ebuild:
+  Version bump #104492 by Martin Nowack.
 
 *wine-20050725-r1 (24 Aug 2005)
 *wine-20050111-r2 (24 Aug 2005)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 0afaebd50df5..03f31b171ddd 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -8,8 +8,9 @@ MD5 6c66896742c41611bc3b57a9931fdf67 wine-20050419.ebuild 3764
 MD5 9dc47b39e00bea2064474e3afe52aa1e wine-20050628.ebuild 3828
 MD5 f1be5e15e0d156796ad3bc9d54271d84 wine-20050725-r1.ebuild 3829
 MD5 a8557f5b07b720dfb156f46c8e30b24b wine-20041019-r3.ebuild 3019
-MD5 d088ae8efcf5cb47e76dc628f1b0acdd ChangeLog 18698
+MD5 dd8ab5766b5f8a3ac7ddd7e15c744e5d ChangeLog 18921
 MD5 0aea125fe95aaead526e5a92213fa33a wine-20050524.ebuild 3826
+MD5 a88b1c3805433fbd7138fd2ff24da76b wine-20050830.ebuild 3815
 MD5 5bf58e79f25d01b2d0ee60629ec13065 wine-20050310-r1.ebuild 3829
 MD5 9d19cae37895df966e850d3054ef2513 files/digest-wine-20050419 67
 MD5 7a55fde5c2def5d2925fab4955433c2c files/wine-20050524-alsa-headers.patch 669
@@ -17,6 +18,7 @@ MD5 e1f0b4cbd720c0f77c445d370c0c3b46 files/wine-cvs-winelauncher-temp.patch 1007
 MD5 46ecb0d10e6a2ad66abeb0a2d6dd0a3d files/wine-hangfix-bug2660.patch 476
 MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r2 67
 MD5 67846279ad436d5d70d0857d29c5fabf files/20050211-docs.patch 719
+MD5 700a585af86289d0c4ac87f11dfcd2e3 files/wine-20050830-gcc-32bit.patch 378
 MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584
 MD5 fe364ce26a93f838a04f30b274df034c files/digest-wine-20050211 67
 MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
@@ -26,12 +28,14 @@ MD5 f9ded3113cb95a488a47c43fcd71467b files/digest-wine-20050524 67
 MD5 f2d7d30c9e5811da2b6f4cb79c80f5cd files/digest-wine-20050725-r1 67
 MD5 03f968d969bdc86d7afd384b026aa7cf files/digest-wine-20050310-r1 67
 MD5 911ab19b2f76abd8034c35fc86104ee0 files/wine-20050725-gcc-32bit.patch 374
+MD5 c8ec4d9cf45eb34d587a17129ab09fb9 files/digest-wine-20050830 67
+MD5 8eeac00eaf290def7bac0e2c3b479ea6 files/wine-20050830-no-ldap.patch 3994
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 45243901331840c35f12426a17b31bd2 files/wine-20050310-upstream-colortable.patch 1546
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDF46/gIKl8Uu19MoRAmQoAJ93r1GR0vTgJC560C5o7R1sS7LcwwCfYUOp
-6Qr7ysjn6f922uYu+VZLFW0=
-=pxHj
+iD8DBQFDF6HUgIKl8Uu19MoRAnUhAJ9izaX8Xo1Yh49ulJCWKxWhrdmUlgCeO+Mu
+l/A6cY78aTlh4D5E91EBwug=
+=VXCY
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/digest-wine-20050830 b/app-emulation/wine/files/digest-wine-20050830
new file mode 100644
index 000000000000..0dd93d94c1aa
--- /dev/null
+++ b/app-emulation/wine/files/digest-wine-20050830
@@ -0,0 +1 @@
+MD5 5d95439a74decd1f94dd8d370a24f442 Wine-20050830.tar.gz 12433457
diff --git a/app-emulation/wine/files/wine-20050830-gcc-32bit.patch b/app-emulation/wine/files/wine-20050830-gcc-32bit.patch
new file mode 100644
index 000000000000..faa27d396e7b
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050830-gcc-32bit.patch
@@ -0,0 +1,11 @@
+--- tools/winegcc/winegcc.c
++++ tools/winegcc/winegcc.c
+@@ -863,6 +863,8 @@
+ 			opts.gui_app = 0;
+ 		    else if (strcmp("-municode", argv[i]) == 0)
+ 			opts.unicode_app = 1;
++		    else if (strcmp("-m32", argv[i]) == 0 || strcmp("-m64", argv[i]) == 0)
++			raw_linker_arg = 1;
+ 		    break;
+                 case 'n':
+                     if (strcmp("-nostdinc", argv[i]) == 0)
diff --git a/app-emulation/wine/files/wine-20050830-no-ldap.patch b/app-emulation/wine/files/wine-20050830-no-ldap.patch
new file mode 100644
index 000000000000..716a863f4c07
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050830-no-ldap.patch
@@ -0,0 +1,93 @@
+Fix build error:
+x86_64-pc-linux-gnu-gcc -c -I. -I. -I../../include -I../../include \
+	-D__WINESRC__ -DWINE_NO_DEBUG_MSGS -DWINE_NO_TRACE_MSGS  -D_REENTRANT \
+	-fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing \
+	-gstabs+ -Wpointer-arith  -O2 -march=k8 -pipe -o add.o add.c
+In file included from add.c:39:
+winldap_private.h:289: error: syntax error before "BerElement"
+winldap_private.h:290: error: syntax error before "BerElement"
+winldap_private.h:322: error: syntax error before "BerElement"
+winldap_private.h:323: error: syntax error before "BerElement"
+make[2]: *** [add.o] Error 1
+
+http://bugs.gentoo.org/104492
+http://bugs.winehq.com/show_bug.cgi?id=3265
+
+--- dlls/wldap32/misc.c
++++ dlls/wldap32/misc.c
+@@ -125,7 +125,8 @@ ULONG WLDAP32_ldap_count_references( WLD
+     return ret;
+ }
+ 
+-PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement** ptr )
++PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
++    WLDAP32_BerElement** ptr )
+ {
+     PCHAR ret = NULL;
+ #ifdef HAVE_LDAP
+@@ -143,7 +144,8 @@ PCHAR ldap_first_attributeA( WLDAP32_LDA
+     return ret;
+ }
+ 
+-PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement** ptr )
++PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
++    WLDAP32_BerElement** ptr )
+ {
+     PWCHAR ret = NULL;
+ #ifdef HAVE_LDAP
+@@ -211,7 +213,8 @@ ULONG WLDAP32_ldap_msgfree( WLDAP32_LDAP
+     return ret;
+ }
+ 
+-PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement *ptr )
++PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
++    WLDAP32_BerElement *ptr )
+ {
+     PCHAR ret = NULL;
+ #ifdef HAVE_LDAP
+@@ -229,7 +232,8 @@ PCHAR ldap_next_attributeA( WLDAP32_LDAP
+     return ret;
+ }
+ 
+-PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement *ptr )
++PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
++    WLDAP32_BerElement *ptr )
+ {
+     PWCHAR ret = NULL;
+ #ifdef HAVE_LDAP
+--- dlls/wldap32/winldap_private.h
++++ dlls/wldap32/winldap_private.h
+@@ -43,6 +43,11 @@ typedef enum {
+     WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED =   0x61
+ } LDAP_RETCODE;
+ 
++typedef struct berelement
++{
++    PCHAR opaque;
++} WLDAP32_BerElement;
++
+ #define LDAP_OPT_THREAD_FN_PTRS         0x05
+ #define LDAP_OPT_REBIND_FN              0x06
+ #define LDAP_OPT_REBIND_ARG             0x07
+@@ -286,8 +291,8 @@ ULONG ldap_extended_operation_sA(WLDAP32
+     PCHAR*,struct WLDAP32_berval**);
+ ULONG ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*,
+     PWCHAR*,struct WLDAP32_berval**);
+-PCHAR ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement**);
+-PWCHAR ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement**);
++PCHAR ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
++PWCHAR ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
+ WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ PCHAR ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+@@ -319,8 +324,8 @@ ULONG ldap_modrdn2_sW(WLDAP32_LDAP*,PWCH
+ ULONG ldap_modrdn_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
+ ULONG ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
+ ULONG WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*);
+-PCHAR ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement*);
+-PWCHAR ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement*);
++PCHAR ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
++PWCHAR ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
+ WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ WLDAP32_LDAP *ldap_openA(PCHAR,ULONG);
diff --git a/app-emulation/wine/wine-20050830.ebuild b/app-emulation/wine/wine-20050830.ebuild
new file mode 100644
index 000000000000..70a3cdca8110
--- /dev/null
+++ b/app-emulation/wine/wine-20050830.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.1 2005/09/02 00:49:57 vapier Exp $
+
+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.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses lcms" #doc
+RESTRICT="test" #72375
+
+RDEPEND=">=media-libs/freetype-2.0.0
+	media-fonts/corefonts
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	X? ( virtual/x11 )
+	arts? ( kde-base/arts )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg )
+	glut? ( virtual/glut )
+	lcms? ( media-libs/lcms )
+	amd64? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1
+		>=sys-kernel/linux-headers-2.6
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+#	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
+
+pkg_setup() {
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "Make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit code"
+		fi
+		if has_multilib_profile ; then
+			export ABI=x86
+		else
+			append-flags -m32
+			append-ldflags -m32
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack Wine-${PV}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
+	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
+	epatch "${FILESDIR}"/20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
+	epatch "${FILESDIR}"/wine-20050830-no-ldap.patch
+}
+
+config_cache() {
+	local h ans="no"
+	use ${1} && ans="yes"
+	shift
+	for h in "$@" ; do
+		export ac_cv_${h}=${ans}
+	done
+}
+
+src_compile() {
+	export LDCONFIG=/bin/true
+	config_cache jack header_jack_jack_h
+	config_cache cups header_cups_cups_h
+	config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open
+	use arts || export ARTSCCONFIG="/bin/false"
+	config_cache nas header_audio_audiolib_h header_audio_soundlib_h
+	config_cache gif header_gif_lib_h
+	config_cache glut lib_glut_glutMainLoop
+	config_cache jpeg header_jpeglib_h
+	config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
+	config_cache lcms header_lcms_h
+
+	strip-flags
+	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
+
+#	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
+#		export DB2PDF=true
+#		export DB2PS=true
+#	fi
+
+	#	$(use_enable amd64 win64)
+	# USE=debug is broken in this release
+	econf \
+		CC=$(tc-getCC) \
+		--sysconfdir=/etc/wine \
+		$(use_with ncurses curses) \
+		$(use_with opengl) \
+		$(use_with X x) \
+		$(use_enable debug trace) \
+		$(use_enable debug) \
+		|| die "configure failed"
+
+	emake -j1 depend || die "depend"
+	emake all || die "all"
+#	if use doc ; then
+#		VARTEXFONTS=${T} \
+#		emake -j1 -C documentation doc || die "docs"
+#	fi
+}
+
+src_install() {
+	make \
+		prefix="${D}"/usr \
+		bindir="${D}"/usr/bin \
+		datadir="${D}"/usr/share \
+		includedir="${D}"/usr/include/wine \
+		sysconfdir="${D}"/etc/wine \
+		mandir="${D}"/usr/share/man \
+		libdir="${D}"/usr/$(get_libdir) \
+		dlldir="${D}"/usr/$(get_libdir)/wine \
+		install || die
+#	use doc && dodoc documentation/*.pdf
+
+	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README
+}
+
+pkg_postinst() {
+	einfo "~/.wine/config is now deprecated.  For configuration either use"
+	einfo "winecfg or regedit HKCU\\Software\\Wine"
+}