Fix building with USE=-X #107870 by ChazeFroy and dont display library warning since it is irrelevant for Gentoo users #107971 by Holly Bostick.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 88 insertions, 23 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index b1e6b93e02cf..b0d127b3caab 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.107 2005/10/02 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.108 2005/10/03 22:34:18 vapier Exp $
+
+  03 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-20050930-dont-warn-lib-path.patch,
+  +files/wine-20050930-no-x.patch, wine-20050930.ebuild:
+  Fix building with USE=-X #107870 by ChazeFroy and dont display library
+  warning since it is irrelevant for Gentoo users #107971 by Holly Bostick.
 
   02 Oct 2005; Mike Frysinger <vapier@gentoo.org>
   files/wine-20041019-alsa-headers.patch:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index a16607e3544a..afd75b879440 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22132d58bbe6f5edddcc8c37c457bcec wine-20050930.ebuild 3458
+MD5 77c376d067b19448d6de42b672f49763 wine-20050930.ebuild 3954
 MD5 087a7f52355538ccc5654be4a35db18d wine-20050111-r2.ebuild 3219
 MD5 f674dd506cdfb07f71651729afc45401 wine-20050211.ebuild 3725
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
@@ -9,7 +9,7 @@ MD5 6c66896742c41611bc3b57a9931fdf67 wine-20050419.ebuild 3764
 MD5 9dc47b39e00bea2064474e3afe52aa1e wine-20050628.ebuild 3828
 MD5 f1be5e15e0d156796ad3bc9d54271d84 wine-20050725-r1.ebuild 3829
 MD5 e459abd4e5de2e549b1d93de6cb16dcf wine-20041019-r3.ebuild 3074
-MD5 aa7ef64424dd15bbbac6b41ae6cc12b3 ChangeLog 19324
+MD5 fec1c0756150d91f06c37b696a320499 ChangeLog 19630
 MD5 0aea125fe95aaead526e5a92213fa33a wine-20050524.ebuild 3826
 MD5 a88b1c3805433fbd7138fd2ff24da76b wine-20050830.ebuild 3815
 MD5 5bf58e79f25d01b2d0ee60629ec13065 wine-20050310-r1.ebuild 3829
@@ -23,9 +23,11 @@ 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
+MD5 c3bac6bd0a3c6a35aaaae8c7888c30f3 files/wine-20050930-no-x.patch 601
 MD5 73a9223d839cbaa35c2497dd40a17015 files/digest-wine-20050628 67
 MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257
 MD5 f9ded3113cb95a488a47c43fcd71467b files/digest-wine-20050524 67
+MD5 d2a0eccb86ce76caa334965b6bdd9251 files/wine-20050930-dont-warn-lib-path.patch 691
 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
@@ -38,7 +40,7 @@ MD5 45243901331840c35f12426a17b31bd2 files/wine-20050310-upstream-colortable.pat
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDP1OVgIKl8Uu19MoRAsQiAJ9CJar3IoWy42bqQKkgtMQ+ML3oSwCfVuqk
-W3QqNgBEcWMKYRVFFPxkHuw=
-=dGo5
+iD8DBQFDQbI+gIKl8Uu19MoRAkRGAJ44DRK2CnX+mAONfIiK+6p/WhMPlQCfcb18
+nPWHL6wpCAYGuKexCGRIBAU=
+=3jVD
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-20050930-dont-warn-lib-path.patch b/app-emulation/wine/files/wine-20050930-dont-warn-lib-path.patch
new file mode 100644
index 000000000000..28d0782d1770
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050930-dont-warn-lib-path.patch
@@ -0,0 +1,22 @@
+Hide warning so users don't freak out and do stupid stuff.
+
+http://bugs.gentoo.org/107971
+
+--- wine/Makefile.in
++++ wine/Makefile.in
+@@ -86,6 +86,7 @@
+ install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
+ 
+ install:: install-lib install-dev install-aclocal
++ifeq (dont,warn) #($(DESTDIR),)
+ 	-$(LDCONFIG)
+ 	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
+ 	then								\
+@@ -98,6 +99,7 @@
+ 		echo "*************************************************" ; \
+ 		echo "*************************************************" ; \
+ 	fi
++endif
+ 
+ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
+ 	$(RM) $(datadir)/aclocal/wine.m4
diff --git a/app-emulation/wine/files/wine-20050930-no-x.patch b/app-emulation/wine/files/wine-20050930-no-x.patch
new file mode 100644
index 000000000000..8f9db9998134
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050930-no-x.patch
@@ -0,0 +1,22 @@
+Make sure we only depend on ddraw_test if X support is enabled
+
+http://bugs.gentoo.org/107870 (among others)
+http://bugs.winehq.org/show_bug.cgi?id=3480
+
+--- wine/programs/winetest/Makefile.in
++++ wine/programs/winetest/Makefile.in
+@@ -18,12 +18,13 @@
+ RC_BINSRC = winetest.rc
+ RC_BINARIES = wine.ico 
+ 
++XFILES = ddraw_test.exe$(DLLEXT)
+ TESTBINS = \
++	@XFILES@ \
+ 	advpack_test.exe$(DLLEXT) \
+ 	advapi32_test.exe$(DLLEXT) \
+ 	comctl32_test.exe$(DLLEXT) \
+ 	crypt32_test.exe$(DLLEXT) \
+-	ddraw_test.exe$(DLLEXT) \
+ 	dinput_test.exe$(DLLEXT) \
+ 	dsound_test.exe$(DLLEXT) \
+ 	gdi32_test.exe$(DLLEXT) \
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index a9067fac4e4e..672aaa1c84df 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
 # 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-20050930.ebuild,v 1.1 2005/10/01 00:48:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.2 2005/10/03 22:34:18 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ 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"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -21,13 +21,18 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	X? ( virtual/x11 )
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
 	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	truetype? ( media-libs/freetype )
+	scanner? ( media-gfx/sane-backends )
 	amd64? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
 		>=app-emulation/emul-linux-x86-soundlibs-2.1
@@ -63,38 +68,46 @@ src_unpack() {
 	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-gcc-32bit.patch
+	epatch "${FILESDIR}"/wine-20050930-no-x.patch
+	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 }
 
 config_cache() {
 	local h ans="no"
-	use ${1} && ans="yes"
+	use $1 && ans="yes"
 	shift
 	for h in "$@" ; do
-		export ac_cv_${h}=${ans}
+		[[ ${h} == *.h ]] \
+			&& h=header_${h} \
+			|| h=lib_${h}
+		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
+	use arts    || export ARTSCCONFIG="/bin/false"
+	use esd     || export ESDCONFIG="/bin/false"
+	use scanner || export sane_devel="no"
+	config_cache jack jack/jack.h
+	config_cache cups cups/cups.h
+	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
+	config_cache nas audio/audiolib.h audio/soundlib.h
+	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache ldap ldap.h lber.h
+	config_cache gif gif_lib.h
+	config_cache glut glut:glutMainLoop
+	config_cache jpeg jpeglib.h
+	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
+	config_cache lcms lcms.h
+	use x86 && config_cache truetype freetype:FT_Init_FreeType
 
 	strip-flags
 	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
 	#	$(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) \