Add 2.9 development branch (bug #298387 by sping).

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 244 insertions, 1 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index eb250e46fed8..7d394e3c849c 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.254 2010/06/29 01:06:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.255 2010/08/14 08:06:26 dirtyepic Exp $
+
+*wxGTK-2.9.1 (14 Aug 2010)
+
+  14 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.9.1.ebuild,
+  +files/wxGTK-2.9.1-collision.patch:
+  Add 2.9 development branch (bug #298387 by sping).
 
   29 Jun 2010; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.11.0.ebuild:
   Really make tiff dependency optional (bug #326061).
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.1-collision.patch
new file mode 100644
index 000000000000..552049ae9d80
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.1-collision.patch
@@ -0,0 +1,83 @@
+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 find it.
+
+diff --git a/Makefile.in b/Makefile.in
+index 449145d..24264e9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13193,10 +13193,9 @@ 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) $(__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_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 \
+@@ -14039,7 +14038,8 @@ 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) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -14047,7 +14047,7 @@ locale_install:
+ 	$(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
+ 
+diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
+index 1ec2056..6cffc04 100644
+--- 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
+diff --git a/src/common/translation.cpp b/src/common/translation.cpp
+index 9363453..8d7c419 100644
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1288,7 +1288,7 @@ void wxTranslations::SetLanguage(const wxString& lang)
+ 
+ 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
+diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
+index a26143e..31ee671 100644
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -120,7 +120,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.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.ebuild
new file mode 100644
index 000000000000..b05d5ae7aa0e
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.ebuild,v 1.1 2010/08/14 08:06:26 dirtyepic Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+SRC_URI="mirror://sourceforge/wxwindows/wxWidgets-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxwindows/wxWidgets-docs-html-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome gstreamer opengl pch sdl tiff"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=x11-libs/gtk+-2.18
+		>=dev-libs/glib-2.22
+		media-libs/jpeg
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome? ( gnome-base/libgnomeprintui )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff )
+		)"
+
+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}/wxWidgets-${PV}"
+
+src_unpack() {
+	unpack wxWidgets-${PV}.tar.bz2
+	if use doc; then
+		cd "${S}"/docs
+		unpack wxWidgets-docs-html-${PV}.tar.bz2
+		mv "${S}"/docs/wxWidgets-${PV} "${S}"/docs/html
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9.1-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 provide debugging support in the library, and
+	# apps can now enable/disable debugging on an individual basis without
+	# needing to care about what flags wxGTK was built with.
+	# 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)"
+
+	# wxBase options
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake || die "make failed."
+}
+
+#src_test() {
+#	cd "${S}"/wxgtk_build/tests
+#	emake || die "failed building testsuite"
+#	# currently fails
+#	./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/html/*
+	fi
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}