Remove old version wrt #257611.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 9aa73bf01018d07bb8e3191ccdb24d94be5cb880..31be516a0c62d3f166395b0402f22532a3ca1ffb 100644 (file)
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.139 2010/03/12 23:40:28 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.140 2010/06/25 17:08:39 ssuominen Exp $
+
+  25 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -files/1.4.34-gcc4-fix-includes.patch, -fox-1.4.34-r1.ebuild:
+  Remove old version wrt #257611.
 
 *fox-1.6.37 (12 Mar 2010)
 

diff --git a/x11-libs/fox/files/1.4.34-gcc4-fix-includes.patch b/x11-libs/fox/files/1.4.34-gcc4-fix-includes.patch
deleted file mode 100644 (file)
index 7521f14..0000000
--- a/x11-libs/fox/files/1.4.34-gcc4-fix-includes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From tbm@cyrius.com Sun Mar 19 17:06:33 2006
-From: Martin Michlmayr <tbm@cyrius.com>
-To: 355998@bugs.debian.org
-Cc: jeroen@fox-toolkit.org, foxgui-users-request@lists.sourceforge.ne
-Subject: GCC 4.1 compilation fix for fox version 1.4
-X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
-       (1.212-2003-09-23-exp) on spohr.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,VALID_BTS_CONTROL 
-       autolearn=no version=2.60-bugs.debian.org_2005_01_02
-X-CrossAssassin-Score: 2
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset=iso-8859-1
-
-tags 355998 + patch
-thanks
-
-The following patch makes fox1.4 compile with GCC 4.1.  Please see
-http://bugs.debian.org/355998
-
-
---- ./include/FXString.h~      2006-03-20 00:34:59.000000000 +0000
-+++ ./include/FXString.h       2006-03-20 00:35:06.000000000 +0000
-@@ -26,6 +26,39 @@
- 
- namespace FX {
- 
-+FXAPI FXint compare(const FXchar* s1,const FXchar* s2);
-+FXAPI FXint compare(const FXchar* s1,const FXString& s2);
-+FXAPI FXint compare(const FXString& s1,const FXchar* s2);
-+FXAPI FXint compare(const FXString& s1,const FXString& s2);
-+
-+FXAPI FXint compare(const FXchar* s1,const FXchar* s2,FXint n);
-+FXAPI FXint compare(const FXchar* s1,const FXString& s2,FXint n);
-+FXAPI FXint compare(const FXString& s1,const FXchar* s2,FXint n);
-+FXAPI FXint compare(const FXString& s1,const FXString& s2,FXint n);
-+
-+FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2);
-+FXAPI FXint comparecase(const FXchar* s1,const FXString& s2);
-+FXAPI FXint comparecase(const FXString& s1,const FXchar* s2);
-+FXAPI FXint comparecase(const FXString& s1,const FXString& s2);
-+
-+FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2,FXint n);
-+FXAPI FXint comparecase(const FXchar* s1,const FXString& s2,FXint n);
-+FXAPI FXint comparecase(const FXString& s1,const FXchar* s2,FXint n);
-+FXAPI FXint comparecase(const FXString& s1,const FXString& s2,FXint n);
-+
-+FXAPI FXString FXStringFormat(const FXchar* fmt,...) FX_PRINTF(1,2) ;
-+FXAPI FXString FXStringVFormat(const FXchar* fmt,va_list args);
-+
-+FXAPI FXString FXStringVal(FXint num,FXint base);
-+FXAPI FXString FXStringVal(FXuint num,FXint base);
-+
-+FXAPI FXString FXStringVal(FXlong num,FXint base);
-+
-+FXAPI FXString FXStringVal(FXfloat num,FXint prec,FXbool exp);
-+FXAPI FXString FXStringVal(FXdouble num,FXint prec,FXbool exp);
-+
-+FXAPI FXint FXIntVal(const FXString& s,FXint base);
-+FXAPI FXuint FXUIntVal(const FXString& s,FXint base);
- 
- /**
- * FXString provides essential string manipulation capabilities.
---- ./include/FXQuatd.h~       2006-03-20 00:45:12.000000000 +0000
-+++ ./include/FXQuatd.h        2006-03-20 00:46:40.000000000 +0000
-@@ -30,6 +30,8 @@
- 
- class FXMat3d;
- 
-+class FXQuatd;
-+FXAPI FXQuatd arc(const FXVec3d& a,const FXVec3d& b);
- 
- /// Double-precision quaternion
- class FXAPI FXQuatd : public FXVec4d {
---- ./include/FXQuatf.h~       2006-03-20 00:45:28.000000000 +0000
-+++ ./include/FXQuatf.h        2006-03-20 00:46:29.000000000 +0000
-@@ -30,6 +30,8 @@
- 
- class FXMat3f;
- 
-+class FXQuatf;
-+FXAPI FXQuatf arc(const FXVec3f& a,const FXVec3f& b);
- 
- /// Single-precision quaternion
- class FXAPI FXQuatf : public FXVec4f {
-
--- 
-Martin Michlmayr
-http://www.cyrius.com/
-
-
-

diff --git a/x11-libs/fox/fox-1.4.34-r1.ebuild b/x11-libs/fox/fox-1.4.34-r1.ebuild
deleted file mode 100644 (file)
index cf07374..0000000
--- a/x11-libs/fox/fox-1.4.34-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34-r1.ebuild,v 1.12 2009/01/09 13:57:43 remi Exp $
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.4"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
-
-RDEPEND="x11-libs/libXrandr
-       x11-libs/libXcursor
-       x11-libs/fox-wrapper
-       bzip2? ( >=app-arch/bzip2-1.0.2 )
-       cups? ( net-print/cups )
-       jpeg? ( >=media-libs/jpeg-6b )
-       opengl? ( virtual/opengl virtual/glu )
-       png? ( >=media-libs/libpng-1.2.5 )
-       tiff? ( >=media-libs/tiff-3.5.7 )
-       truetype? ( =media-libs/freetype-2*
-               x11-libs/libXft )
-       zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-       x11-proto/xextproto
-       x11-libs/libXt"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-       $(use_enable cups) \
-       $(use_enable jpeg) \
-       $(use_with opengl) \
-       $(use_enable png) \
-       $(use_enable threads threadsafe) \
-       $(use_enable tiff) \
-       $(use_with truetype xft) \
-       $(use_enable zlib)"
-
-src_unpack() {
-       fox_src_unpack
-       epatch "${FILESDIR}"/${PV}-gcc4-fix-includes.patch
-}