Remove old.

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

3 files changed, 5 insertions, 244 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 8ef444454887..1810b1607827 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # 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.275 2011/11/12 13:55:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.276 2011/12/09 03:42:26 dirtyepic Exp $
+
+  09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.8.10.1-r5.ebuild,
+  -files/wxGTK-2.8.10-collision.patch:
+  Remove old.
 
   12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
   wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild,
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
deleted file mode 100644
index 244ce7328675..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naurp wxPython-src-2.8.10.1-orig/Makefile.in wxPython-src-2.8.10.1/Makefile.in
---- wxPython-src-2.8.10.1-orig/Makefile.in	2009-05-17 15:57:18.682065956 -0600
-+++ wxPython-src-2.8.10.1/Makefile.in	2009-05-17 16:01:41.554066672 -0600
-@@ -27,6 +27,7 @@ STRIP = @STRIP@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- BK_DEPS = @BK_DEPS@
- BK_MAKE_PCH = @BK_MAKE_PCH@
- srcdir = @srcdir@
-@@ -11448,10 +11449,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p =
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___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_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___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_richtextdll___depname) $(__install_richtextlib___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 $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
-+	do $(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
- 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -12207,8 +12207,8 @@ samples: 
- 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)
-+	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/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
-@@ -12216,7 +12216,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 -Naurp wxPython-src-2.8.10.1-orig/src/common/intl.cpp wxPython-src-2.8.10.1/src/common/intl.cpp
---- wxPython-src-2.8.10.1-orig/src/common/intl.cpp	2009-01-03 14:40:01.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/intl.cpp	2009-05-17 16:04:28.683867667 -0600
-@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
-   m_initialized = false;
- }
- 
-+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
-+
- // NB: this function has (desired) side effect of changing current locale
- bool wxLocale::Init(const wxChar *szName,
-                     const wxChar *szShort,
-@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName
-   bool bOk = true;
-   if ( bLoadDefault )
-   {
--    bOk = AddCatalog(wxT("wxstd"));
-+    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
- 
-     // there may be a catalog with toolkit specific overrides, it is not
-     // an error if this does not exist
-diff -Naurp wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.10.1/utils/wxrc/Makefile.in
---- wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in	2009-04-27 21:38:59.000000000 -0600
-+++ wxPython-src-2.8.10.1/utils/wxrc/Makefile.in	2009-05-17 16:03:56.490863515 -0600
-@@ -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.8.10.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
deleted file mode 100644
index bc9359b2a2ef..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.8.10.1-r5.ebuild,v 1.13 2011/11/12 13:55:52 jlec Exp $
-
-EAPI="2"
-
-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
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X doc debug gnome gstreamer odbc opengl pch sdl"
-
-RDEPEND="
-	dev-libs/expat
-	odbc?   ( dev-db/unixODBC )
-	sdl?    ( media-libs/libsdl )
-	X?  (
-		dev-libs/glib:2
-		media-libs/libpng:0
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		media-libs/tiff:0
-		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 )
-		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.8"
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc?	( LGPL-2 )
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
-	# this version only:
-	epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch              # Bug #277722
-	epatch "${FILESDIR}"/${P}-gsocket.patch                    # Bug #278778
-	epatch "${FILESDIR}"/${P}-wxTimer-unbounded-hook.patch     # Bug #301143
-
-	# Fix for >=libpng-1.4.0  Bug #305119.
-	sed -i -e 's:png_check_sig:png_sig_cmp:g' "${S}"/configure{,.in}
-}
-
-src_configure() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-compat26
-			--enable-shared
-			--enable-unicode
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat=sys
-			$(use_enable debug)
-			$(use_enable pch precomp-headers)
-			$(use_with sdl)"
-
-	use odbc \
-		&& myconf="${myconf} --with-odbc=sys" \
-		|| myconf="${myconf} $(use_with odbc)"
-
-	# 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
-			--with-libtiff=sys
-			$(use_enable gstreamer mediactrl)
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			--without-gnomevfs"
-
-	# wxBase options
-	use X || \
-		myconf="${myconf}
-			--disable-gui"
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-
-	emake || die "make failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake || die "make contrib failed."
-	fi
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install || die "install failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake DESTDIR="${D}" install || die "install contrib failed."
-	fi
-
-	cd "${S}"/docs
-	dodoc changes.txt readme.txt todo30.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
-
-	# 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
-}