Fix compilation with clang, dropping broken code in unused function. Also remove old version

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

4 files changed, 55 insertions, 24 deletions

diff --git a/gnustep-apps/graphos/ChangeLog b/gnustep-apps/graphos/ChangeLog
index a5709d66fe79..e52412172983 100644
--- a/gnustep-apps/graphos/ChangeLog
+++ b/gnustep-apps/graphos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-apps/graphos
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/graphos/ChangeLog,v 1.2 2011/01/03 09:56:17 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/graphos/ChangeLog,v 1.3 2012/02/09 20:12:09 voyageur Exp $
+
+  09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -graphos-0.1.ebuild,
+  graphos-0.2.ebuild, +files/graphos-0.2-remove_psDescription.patch:
+  Fix compilation with clang, dropping broken code in unused function. Also
+  remove old version
 
 *graphos-0.2 (03 Jan 2011)
 
diff --git a/gnustep-apps/graphos/files/graphos-0.2-remove_psDescription.patch b/gnustep-apps/graphos/files/graphos-0.2-remove_psDescription.patch
new file mode 100644
index 000000000000..21eddd32aa4f
--- /dev/null
+++ b/gnustep-apps/graphos/files/graphos-0.2-remove_psDescription.patch
@@ -0,0 +1,38 @@
+--- GRText.m	2010/12/07 08:43:36	1.27
++++ GRText.m	2011/04/06 09:56:16	1.28
+@@ -2,7 +2,7 @@
+  Project: Graphos
+  GRText.m
+ 
+- Copyright (C) 2000-2010 GNUstep Application Project
++ Copyright (C) 2000-2011 GNUstep Application Project
+ 
+  Author: Enrico Sersale (original GDraw implementation)
+  Author: Ing. Riccardo Mottola
+@@ -238,26 +238,6 @@
+     return dict;
+ }
+ 
+-- (NSString *)psDescription
+-{
+-    NSString *pss;
+-
+-    if(!visible)
+-        return nil;
+-
+-    pss = [NSString stringWithFormat:
+-        @"\n/%@ %.3f sf\nn\n%.3f %.3f m\n(%@)show\n",
+-        [font fontName], fsize, pos.x, pos.y, str];
+-    if(stroked)
+-        pss = [pss stringByAppendingFormat: @"%.3f %.3f %.3f %.3f k\nstroke\n",
+-            strokeColor[0], strokeColor[1], strokeColor[2], strokeColor[3]];
+-    if(filled)
+-        pss = [pss stringByAppendingFormat: @"%.3f %.3f %.3f %.3f k\nfill\n",
+-            fillColor[0], fillColor[1], fillColor[2], fillColor[3]];
+-
+-    return pss;
+-}
+-
+ - (NSString *)fontName
+ {
+     return [font fontName];
diff --git a/gnustep-apps/graphos/graphos-0.1.ebuild b/gnustep-apps/graphos/graphos-0.1.ebuild
deleted file mode 100644
index 22e65df11068..000000000000
--- a/gnustep-apps/graphos/graphos-0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/graphos/graphos-0.1.ebuild,v 1.1 2010/06/28 15:17:18 voyageur Exp $
-
-inherit eutils gnustep-2
-
-MY_PN=Graphos
-DESCRIPTION="vector drawing application centered around bezier paths"
-HOMEPAGE="http://gap.nongnu.org/graphos/index.html"
-SRC_URI="http://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/graphos/graphos-0.2.ebuild b/gnustep-apps/graphos/graphos-0.2.ebuild
index e47b9cf24f4d..7520f73e89be 100644
--- a/gnustep-apps/graphos/graphos-0.2.ebuild
+++ b/gnustep-apps/graphos/graphos-0.2.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/graphos/graphos-0.2.ebuild,v 1.1 2011/01/03 09:56:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/graphos/graphos-0.2.ebuild,v 1.2 2012/02/09 20:12:09 voyageur Exp $
 
+EAPI=4
 inherit eutils gnustep-2
 
-MY_PN=Graphos
+MY_P=${PN/g/G}-${PV}
 DESCRIPTION="vector drawing application centered around bezier paths"
 HOMEPAGE="http://gap.nongnu.org/graphos/index.html"
-SRC_URI="http://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-remove_psDescription.patch
+}