Stop installing the mmedia library which has an automagic dependency on

esd. Bug #174874 by Volker Hemmann.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

4 files changed, 243 insertions, 5 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 1bfd5a7d49c7..d6b19fc35c24 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.190 2008/06/07 19:12:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.191 2008/06/29 04:31:58 dirtyepic Exp $
+
+*wxGTK-2.6.4.0-r4 (29 Jun 2008)
+
+  29 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.6.4-mmedia.patch, +wxGTK-2.6.4.0-r4.ebuild:
+  Stop installing the mmedia library which has an automagic dependency on
+  esd. Bug #174874 by Volker Hemmann.
 
 *wxGTK-2.8.7.1-r2 (07 Jun 2008)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 75d96eb816a8..c7f2276976b6 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
+AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
 AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 SHA1 0af47b2b10b1c472b8d6ec9e43160c4b28527bf0 SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5
 AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1085 RMD160 2af7918740d4826822af82a50b63ea00c5f40694 SHA1 c03791332103b199921dbe6e132d5f215d3a2aee SHA256 63cec2a3eb7c0a12c92230a68aa5878d518f7ebe504d8714c49140a23e72fbd3
 AUX wxGTK-2.8.4-collision.patch 6073 RMD160 3e3d763d08d10a4d7745017fd2fc8625a6a4d6d9 SHA1 23576c694910c402f13fff3c0c360a7ebe2635dd SHA256 cc7b15e7c29469f5b5ec476f0cfc4e1bdf5693f1c8b95e51eb336af4bc72e838
@@ -14,14 +15,15 @@ DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2a
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r1.ebuild 4634 RMD160 6db1610df15f3c630a390d4c85177238dbb650a2 SHA1 01674d3d971f4f9d80cae000a459ae791218f370 SHA256 7eb2cfc6517e05d62b79a93e283406263493e95cbc940ecec41910cae6a6ca73
 EBUILD wxGTK-2.6.4.0-r3.ebuild 4626 RMD160 72ca7a49233a3b10a917981f05ab677378a6acd8 SHA1 b53bef6b1bc1fde638835a221dc700da435024f0 SHA256 dd53ec972c28b62bc361fe4da1a1b691c3a38ef0cd9bd9c17b31f90c6f8b3ee8
+EBUILD wxGTK-2.6.4.0-r4.ebuild 4702 RMD160 68243e3eaea947ed11e74ef2539bcf7d4c6a2ef6 SHA1 f93b0e1fa17ec9569d81577598d51824774556c3 SHA256 9f1286e847feab7b91405079982e7b658e756c812780db762d42e00a70449bcb
 EBUILD wxGTK-2.8.7.1-r1.ebuild 3348 RMD160 5c77d6f6fb8ca5f21fa5df984f1ad665227f6704 SHA1 3d76f263fb9acb473b6c717ff35f22c63d510640 SHA256 ac0e1930b89211631f22dad5d5328b3f58664e68a8a6404f061870165f3356a5
 EBUILD wxGTK-2.8.7.1-r2.ebuild 3449 RMD160 01ec7c72dd1c49ac071e3b6197b23fe986043785 SHA1 f50df902aa8e0fc470ad8a7f5bcc34c0fb0d85fc SHA256 dbf513c73d7726a92b0628e7bf1f2d7d84baaa191e6bc7bb7bb50803c69afa06
-MISC ChangeLog 29798 RMD160 49e69b7e87d546eab8ea8f4791b6603787b09089 SHA1 54282c781833855beae98cefdc8de8b363dd0adf SHA256 26a1403f72584138efdfa3ba23f340734497e345072e40e6179cb1e13c20e3c1
+MISC ChangeLog 30053 RMD160 0965847e3d9c619b8069922f01f019e96108431f SHA1 2ee39fa76ea629c1460856085bb4a6f742f77cc7 SHA256 d2c9376067c1b07f466db7031414ab213bd6397e980611d814845809db8bb62f
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhK3YMACgkQiqiDRvmkBmIFFACeNikjGBPInIHAZ0Dm8a2/SLyK
-C7wAnifZh3DBykGFBNNMSv35D3UE3U10
-=bvO9
+iEYEARECAAYFAkhnEE4ACgkQiqiDRvmkBmI1kwCgjNHFnw2DdndjittaPd2lGep9
+XMsAoKs8LzCK0MzNDcv/Mk59VjUiSF2X
+=Q+H/
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch
new file mode 100644
index 000000000000..0f0ba8f42f9b
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in wxPython-src-2.6.4.0/contrib/src/Makefile.in
+--- wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in	2004-09-24 10:57:49.000000000 -0600
++++ wxPython-src-2.6.4.0/contrib/src/Makefile.in	2008-06-28 22:00:31.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.6.4-mmedia.patch,v 1.1 2008/06/29 04:31:59 dirtyepic Exp $
+ 
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
+ 
+ all:
+ 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild
new file mode 100644
index 000000000000..a7e7056642eb
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild,v 1.1 2008/06/29 04:31:58 dirtyepic Exp $
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X doc debug gnome odbc opengl pch sdl unicode"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?	( dev-db/unixODBC )
+	sdl?	( media-libs/libsdl )
+	X?	(
+		>=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0
+		media-libs/jpeg
+		media-libs/tiff
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome?	( gnome-base/libgnomeprintui )
+		opengl?	( virtual/opengl )
+		)"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		X?	(
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+SLOT="2.6"
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc? ( LGPL-2 )
+		doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# General Patches
+
+	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
+	epatch "${FILESDIR}"/${BASE_P}-collision.patch
+	epatch "${FILESDIR}"/${BASE_P}-mmedia.patch				# Bug #174874
+
+	# Patches Specific to this version
+
+	epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
+	epatch "${FILESDIR}"/${P}-g_free.patch
+
+	# Reverse apply patch in wxPython tarball that breaks ABI
+	EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
+		EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
+
+	# wxBase has an automagic sdl dependency.  short circuit it here.
+	# http://bugs.gentoo.org/show_bug.cgi?id=91574
+	use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
+}
+
+src_compile() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-shared
+			--enable-compat24
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)
+			$(use_with odbc)"
+
+	# wxGTK only
+	use X && \
+		myconf="${myconf}
+			--enable-gui
+			--with-libpng
+			--with-libxpm
+			--with-libjpeg
+			--with-libtiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)"
+
+	# wxBase only
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	# in 2.6 we always build ansi
+	# everything else is controlled by USE
+	if ! use debug; then
+		build_wx ansi
+	else
+		build_wx ansi-debug
+	fi
+
+	if use unicode; then
+		if ! use debug; then
+			build_wx unicode
+		else
+			build_wx unicode-debug
+		fi
+	fi
+}
+
+src_install() {
+	# Note - the last version to be installed becomes the default, so install
+	# ansi after unicode
+	install_wx unicode
+	install_wx unicode-debug
+	install_wx ansi
+	install_wx ansi-debug
+
+	dodoc "${S}"/docs/changes.txt
+	dodoc "${S}"/docs/gtk/readme.txt
+
+	if use doc; then
+		dohtml -r "${HTML_S}"/docs/html/*
+	fi
+
+	# We don't want this
+	rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+build_wx() {
+	local build_wx_conf
+
+	case "$1" in
+		ansi)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode"
+		;;
+
+		ansi-debug)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode
+			--enable-debug_flag"
+		;;
+
+		unicode)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode"
+		;;
+
+		unicode-debug)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode
+			--enable-debug_flag"
+		;;
+
+		*)
+			eerror "wxlib.class: build_wx called with invalid argument(s)."
+			die "wxlib.class: build_wx called with invalid argument(s)."
+		;;
+	esac
+
+	mkdir -p build_$1
+	pushd build_$1
+
+	ECONF_SOURCE="${S}" econf \
+		${myconf} \
+		${build_wx_conf} \
+		|| die "Failed to configure $1."
+
+	emake || die "Failed to make $1."
+
+	if [[ -e contrib/src ]]; then
+		cd contrib/src
+		emake || die "Failed to make $1 contrib."
+	fi
+
+	popd
+}
+
+install_wx() {
+	if [[ -d build_$1 ]]; then
+		pushd build_$1
+		emake DESTDIR="${D}" install || die "Failed to install $1."
+		if [[ -e contrib/src ]]; then
+			cd contrib/src
+			emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
+		fi
+		popd
+	fi
+}