Version bump. Remove old.

(Portage version: 2.2.0_alpha18/cvs/Linux x86_64)

3 files changed, 31 insertions, 38 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index ddcce4910267..316e6d069d69 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,13 @@
 # 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.256 2010/11/23 17:50:12 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.257 2011/01/23 01:05:09 dirtyepic Exp $
+
+*wxGTK-2.9.1.1 (23 Jan 2011)
+
+  23 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.9.1.ebuild,
+  +wxGTK-2.9.1.1.ebuild, +files/wxGTK-2.9.1.1-collision.patch,
+  -files/wxGTK-2.9.1-collision.patch:
+  Version bump. Remove old.
 
   23 Nov 2010; Justin Lecher <jlec@gentoo.org> wxGTK-2.8.10.1-r5.ebuild,
   wxGTK-2.8.11.0.ebuild, wxGTK-2.9.1.ebuild:
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.1.1-collision.patch
index 552049ae9d80..8d053fda5e05 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.9.1-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.1.1-collision.patch
@@ -7,11 +7,9 @@ Prevent file collisions between multiple installed SLOTs.
     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 = \
+@@ -13464,10 +13464,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)
@@ -24,17 +22,17 @@ index 449145d..24264e9 100644
  	$(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:
+@@ -14310,7 +14309,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 && $(LN_S) ../lib/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))
++		&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -14047,7 +14047,7 @@ locale_install:
+@@ -14318,7 +14318,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 \
@@ -43,8 +41,6 @@ index 449145d..24264e9 100644
  	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 @@
@@ -56,11 +52,9 @@ index 1ec2056..6cffc04 100644
              <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)
+@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
  
  bool wxTranslations::AddStdCatalog()
  {
@@ -69,8 +63,6 @@ index 9363453..8d7c419 100644
          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
diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
index bfee2f368e8b..621b6cc52c82 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/23 17:50:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.1 2011/01/23 01:05:09 dirtyepic Exp $
 
-EAPI="2"
+EAPI="3"
 
 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 )"
+# 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"
 IUSE="X doc debug gnome gstreamer opengl pch sdl tiff"
@@ -49,19 +51,10 @@ 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
-}
+S="${WORKDIR}/wxPython-src-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.1-collision.patch
+	epatch "${FILESDIR}"/${P}-collision.patch
 }
 
 src_configure() {
@@ -77,12 +70,13 @@ src_configure() {
 			$(use_with sdl)"
 
 	# debug in >=2.9
-	#   if USE="debug", set max debug level (wxDEBUG_LEVEL=2)
+	#   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.
+	# 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"
@@ -121,10 +115,10 @@ src_compile() {
 	emake || die "make failed."
 }
 
+# Currently fails - need to investigate
 #src_test() {
 #	cd "${S}"/wxgtk_build/tests
 #	emake || die "failed building testsuite"
-#	# currently fails
 #	./test -d || ewarn "failed running testsuite"
 #}
 
@@ -139,7 +133,7 @@ src_install() {
 	newdoc gtk/readme.txt gtk_readme.txt
 
 	if use doc; then
-		dohtml -r "${S}"/docs/html/*
+		dohtml -r "${S}"/docs/doxygen/out/html/*
 	fi
 }