Version bump (bug #384037 by radhermit).

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 262 insertions, 10 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 38f6ca50db6f..677c59bacad5 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxGTK
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.280 2011/12/09 15:37:28 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.281 2012/02/12 07:56:13 dirtyepic Exp $
+
+*wxGTK-2.9.3.1 (12 Feb 2012)
+
+  12 Feb 2012; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.9.3.1.ebuild,
+  +files/wxGTK-2.9.3.1-collision.patch:
+  Version bump (bug #384037 by radhermit).
 
   09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   -files/wxGTK-2.6.3-unicode-odbc.patch, -wxGTK-2.6.4.0-r6.ebuild,
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index c29e2d994bc4..98ad0a08c303 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,24 +7,24 @@ AUX wxGTK-2.8.11-libpng15.patch 1390 RMD160 0f835458016a5eddda4f865ddadc6f96da72
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 RMD160 436cc03a4e45ed649298cf08a8ec134b97f4c4b5 SHA1 6cdf8f6e5140355d7bf6433d3afad483201c0961 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65
 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
 AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078f342a7 SHA1 3f6897bfe49c5d3123f7fc53479dcb31977b5600 SHA256 b7470d4e2eaed28b2fedc5f8e94fb897a837daa0aa33c77ca99e4e379b0e9cdf
+AUX wxGTK-2.9.3.1-collision.patch 6082 RMD160 52536f744b1bca3d1d8ab0d2bb73fc0b739e8b7f SHA1 69eace867fb20dba9271b57292756e144bb698ce SHA256 a98df8ef1266c52ab72a9b03aeddda8c1d8a7c79287e0fd71cd7fec7fcb2bb88
+DIST wxPython-docs-2.9.3.1.tar.bz2 14913825 RMD160 becfba8722d3ed71bf2292e69d79895820c9e341 SHA1 0721bdde1fe88db9c2e05e174c07535d20670e33 SHA256 64c6b07c8fa0277b281fb1e6210087e57fb072ce8cabe86d251c3208040cd945
 DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 RMD160 94eae06087bdd930e21bf90cc6672f93a1f5a17a SHA1 05688dc03d61631750f5904273122bb40a2115f5 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
+DIST wxPython-src-2.9.3.1.tar.bz2 49131100 RMD160 cd19b1d07d39c7918c72cf124f4f5cd48836d781 SHA1 0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d
 EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424
 EBUILD wxGTK-2.8.12.0.ebuild 3984 RMD160 cf1b21bd2ea5a0ba3cc330838cbdfc87f66e4776 SHA1 ac568f6fedfde0eead02752bac21af4f65a1942e SHA256 e8888ae59d6f2ccf87d4aad6a65ef768ff2b9e374d0946fa46cac56b25da4d32
 EBUILD wxGTK-2.8.12.1.ebuild 3920 RMD160 44d5991d83308bf4a656f33144f28f46725f4708 SHA1 eded7d061201c7a4188315ac8b22253e25ec1677 SHA256 e586dd1ed0028de25b9822c32be6cef089a04b2dc77b55ecb363fa415b0600fb
 EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2
-MISC ChangeLog 44206 RMD160 256ae0548632ec778a6f73a35af13ffc35caa377 SHA1 507a75449f4472521ff32696764bd2c147af6d5c SHA256 29f4f368e8b0848c6dafa97ace6707ca070f77163afd2e68ca66f5f1376f865a
+EBUILD wxGTK-2.9.3.1.ebuild 4126 RMD160 61406f07132702bd00970220dc3029876ed0abaf SHA1 e2f85db32cf7c43695e765353a63e51828c8f1a4 SHA256 91acf74f46e65acaab51c601f8f73faac0e7d1a89dbb98b38851727c7fbd9658
+MISC ChangeLog 44391 RMD160 8f273a81911c2e5a46b6a381fce349a0dfb12dfd SHA1 f861d03b0a1bf52c607b413a8e5b620b6ac46a87 SHA256 57b12108c012097bc3e55750da0c76cb67807496b575b48b5c612b54f18471d4
 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO4isaAAoJEEdUh39IaPFN0NAIAI/pZClDzHLtW6+yqR0hrv+y
-rnqK2gDeGIjl/+6sgFrgau+rf+rev2gwh3K3R+Y+qfdb6sGoCAqRmoA2Kuso2SCP
-cxivOXjVTnvUwRfLvhTJVcFYtcTRbVZ05rC7IRBmekGMC8bWM6HA0dCDBNNFoher
-rpRR5LDv515pMzbXFO7zjQeFwfkvUFp5PvqXfAXQPm1/HMHMA4qTJwcSu3bmBxQI
-5hbdxut2WN2lW+eNlXp8TnkOskNhrbn0eolCAD7hu9iXeBr//GWoxvOqTrX5WqWj
-Ou1CXnhw5Z2gJQl6ZxIt6/vWMSvjMu1Di8PV5dMZ03B0DakwTS6cVgqXPVXs95U=
-=ijx2
+iEYEARECAAYFAk83cpIACgkQiqiDRvmkBmKHtQCgvlK6vVgiFWPdH2H4u+mSY2oL
+Dl0AnjowtpKBCeQxKGQjDpfkH0Eh6+rB
+=vObI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
new file mode 100644
index 000000000000..cd6c1c13b075
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
@@ -0,0 +1,77 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
+    installed with eselect-wxwidgets.
+  - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(DYLIB_RPATH_INSTALL)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -14964,15 +14964,16 @@ install-wxconfig:
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+-
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+ 	for l in $(LOCALE_LINGUAS) ; do \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -138,7 +138,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+ 
+ bool wxTranslations::AddStdCatalog()
+ {
+-    if ( !AddCatalog(wxS("wxstd")) )
++    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+         return false;
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -124,7 +124,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
new file mode 100644
index 000000000000..294b7716365b
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild,v 1.1 2012/02/12 07:56:13 dirtyepic Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
+		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gnome? ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			>=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+#		test? ( dev-util/cppunit )
+
+PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
+
+SLOT="2.9"
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-collision.patch
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	#   if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
+	#   if USE="-debug" use the default (wxDEBUG_LEVEL=1)
+	#   do not use --disable-debug
+	# this means we always build debugging features into the library, and
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# http://docs.wxwidgets.org/2.9/overview_debugging.html
+	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with !gnome gtkprint)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake || die "make failed."
+}
+
+# Currently fails - need to investigate
+#src_test() {
+#	cd "${S}"/wxgtk_build/tests
+#	emake || die "failed building testsuite"
+#	./test -d || ewarn "failed running testsuite"
+#}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install || die "install failed."
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}