Add USE="png ssl win64" and convert USE flags to $(use_with) #255250 by Johan Verrept.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

4 files changed, 63 insertions, 101 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index d3b5ff1f015e..dea75228a6cb 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.239 2009/01/16 20:05:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.240 2009/01/18 19:36:38 vapier Exp $
+
+  18 Jan 2009; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  wine-1.1.13.ebuild, wine-9999.ebuild:
+  Add USE="png ssl win64" and convert USE flags to $(use_with) #255250 by
+  Johan Verrept.
 
 *wine-1.1.13 (16 Jan 2009)
 
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 0d4d4e036ff3..234b62f46583 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -13,5 +13,6 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<flag name='samba'>Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+	<flag name='win64'>Build a 64bit version of Wine</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index eb99b887d6f1..be5d3ac0900c 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.1 2009/01/16 20:05:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.2 2009/01/18 19:36:38 vapier Exp $
 
-EAPI="1"
-
-inherit eutils flag-o-matic multilib
+EAPI="2"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
 	inherit git
 	SRC_URI=""
+	KEYWORDS=""
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -24,8 +24,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -43,7 +42,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		x11-libs/libXxf86vm
 		x11-apps/xmessage
 	)
-	alsa? ( media-libs/alsa-lib )
+	alsa? ( media-libs/alsa-lib[midi] )
 	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
@@ -54,6 +53,8 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
 	amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
@@ -70,14 +71,6 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-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() {
 	if [[ ${PV} == "9999" ]] ; then
 		git_src_unpack
@@ -90,45 +83,35 @@ src_unpack() {
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
-config_cache() {
-	local h ans="no"
-	use $1 && ans="yes"
-	shift
-	for h in "$@" ; do
-		[[ ${h} == *.h ]] \
-			&& h=header_${h} \
-			|| h=lib_${h}
-		export ac_cv_${h//[:\/.]/_}=${ans}
-	done
-}
-
 src_compile() {
 	export LDCONFIG=/bin/true
-	use esd     || export ac_cv_path_ESDCONFIG=""
-	use scanner || export ac_cv_path_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 xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
-	config_cache ldap ldap.h lber.h
-	config_cache dbus dbus/dbus.h
-	config_cache hal hal/libhal.h
-	config_cache jpeg jpeglib.h
-	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
-
-	strip-flags
-
-	use amd64 && multilib_toolchain_setup x86
 
-	#	$(use_enable amd64 win64)
+	# XXX: should check out these flags too:
+	#	audioio capi fontconfig freetype gphoto
 	econf \
 		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with cups) \
+		$(use_with esd) \
 		$(use_with gnutls) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with lcms cms) \
+		$(use_with ldap) \
+		$(use_with nas) \
 		$(use_with ncurses curses) \
 		$(use_with opengl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with sane scanner) \
+		$(use_with ssl openssl) \
+		$(use_with win64) \
 		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"
@@ -143,8 +126,3 @@ src_install() {
 		doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
 	fi
 }
-
-pkg_postinst() {
-	elog "~/.wine/config is now deprecated.  For configuration either use"
-	elog "winecfg or regedit HKCU\\Software\\Wine"
-}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 1574006eeb02..2d7b6211ce71 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2009 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.26 2009/01/16 20:04:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.27 2009/01/18 19:36:38 vapier Exp $
 
-EAPI="1"
-
-inherit eutils flag-o-matic multilib
+EAPI="2"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
 	inherit git
 	SRC_URI=""
+	KEYWORDS=""
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -24,8 +24,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -43,7 +42,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		x11-libs/libXxf86vm
 		x11-apps/xmessage
 	)
-	alsa? ( media-libs/alsa-lib )
+	alsa? ( media-libs/alsa-lib[midi] )
 	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
@@ -54,6 +53,8 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
 	amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
@@ -70,14 +71,6 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-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() {
 	if [[ ${PV} == "9999" ]] ; then
 		git_src_unpack
@@ -90,45 +83,35 @@ src_unpack() {
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
-config_cache() {
-	local h ans="no"
-	use $1 && ans="yes"
-	shift
-	for h in "$@" ; do
-		[[ ${h} == *.h ]] \
-			&& h=header_${h} \
-			|| h=lib_${h}
-		export ac_cv_${h//[:\/.]/_}=${ans}
-	done
-}
-
 src_compile() {
 	export LDCONFIG=/bin/true
-	use esd     || export ac_cv_path_ESDCONFIG=""
-	use scanner || export ac_cv_path_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 xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
-	config_cache ldap ldap.h lber.h
-	config_cache dbus dbus/dbus.h
-	config_cache hal hal/libhal.h
-	config_cache jpeg jpeglib.h
-	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
-	config_cache lcms lcms.h
-
-	strip-flags
-
-	use amd64 && multilib_toolchain_setup x86
 
-	#	$(use_enable amd64 win64)
+	# XXX: should check out these flags too:
+	#	audioio capi fontconfig freetype gphoto
 	econf \
 		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with cups) \
+		$(use_with esd) \
 		$(use_with gnutls) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with lcms cms) \
+		$(use_with ldap) \
+		$(use_with nas) \
 		$(use_with ncurses curses) \
 		$(use_with opengl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with sane scanner) \
+		$(use_with ssl openssl) \
+		$(use_with win64) \
 		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"
@@ -143,8 +126,3 @@ src_install() {
 		doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
 	fi
 }
-
-pkg_postinst() {
-	elog "~/.wine/config is now deprecated.  For configuration either use"
-	elog "winecfg or regedit HKCU\\Software\\Wine"
-}