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

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 68 insertions, 28 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/Manifest b/gnustep-apps/graphos/Manifest
index dfda401c9704..bfb3f683e55f 100644
--- a/gnustep-apps/graphos/Manifest
+++ b/gnustep-apps/graphos/Manifest
@@ -1,6 +1,15 @@
-DIST Graphos-0.1.tar.gz 115914 RMD160 dd9e0097e9d4e6df5171f3e60b9a6a857fdc363e SHA1 487b1a3bca13f886a843c160bf2f3679c12b02f9 SHA256 e6c607838deddd7ce74918414a1cf1d4ae699f02fc0aefad8e6aaca0d75a805f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX graphos-0.2-remove_psDescription.patch 1030 RMD160 54bf4cfbebf862b89ac38fbcce5ed03d9f987d00 SHA1 de0e86a152e528935b15e0c0166115ead83505e0 SHA256 3871175df2d2077199c379e2e7513a4fccd6bf90b747064df7682f62e0a94434
 DIST Graphos-0.2.tar.gz 117154 RMD160 bd2f0187644bc9f7d240f7cf6d5e30744e0494aa SHA1 774bf046f3699e0e153c7532a8028f1744518fcd SHA256 2dbd7c06b0c7929bdff27eb2de6e012bbc9018f9fcbce1c1111d9a5c0858f253
-EBUILD graphos-0.1.ebuild 549 RMD160 72c0eca4c2a804ab013e26717f5d2c7b27db3744 SHA1 fc1b4c6a400a8bca9e8808eb905a2d709c177fd2 SHA256 d7287c7e612933c478a0678a5c489117592d24ab925159f6fedb133691896d66
-EBUILD graphos-0.2.ebuild 549 RMD160 5ad90707ee63fadc392fb42e4a5450e707161a12 SHA1 c82b87ced692ea687b757f63eedcd897e84826b6 SHA256 f3a96387a27c64b6d3ca0877abefca2d484bbaf121d1125f267a731e2866dd0d
-MISC ChangeLog 516 RMD160 38633aab3a536cae208e3e21564405c391fc09c6 SHA1 ec46f9196b5b67de80cbcba16018318c97f84187 SHA256 0d782700ba9b9bac3384e725a62a55fea477099765b62bf6d8d6ddd499f33413
+EBUILD graphos-0.2.ebuild 622 RMD160 30547e5139284d8b6c0ad8a40b949bbbe30ac25b SHA1 0f76fd4cb90567cdce7a8fa1d33af8e424b46b49 SHA256 5755776ef12631fc96958f63c5a799d0805564abf07c1d1457b05abd581f2b40
+MISC ChangeLog 759 RMD160 2e19d4d423f0a7aa9074da8905c261c50d6c7e1e SHA1 b76c7f6364b608dde59f6ed1bed66f14f7a07828 SHA256 f4a9c4469cd44722ce41c9b59c8536842dd573985058e24a1db727642ae53ddb
 MISC metadata.xml 356 RMD160 d15ba17e56e7484c10eba71a379426545fb2ace4 SHA1 348f390eed77fdf371f54efc3f148cdd35e166ce SHA256 3415fd1d70c40896f247e24d86b133d9671a825c08bbced41a5d410f8206d552
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk80KKoACgkQFYEBGcdFJfKA2QD/UvnlsOaC1sV8IyQ7cyS8DtW8
+51X986G3EAtpBGQ+riAA/3Ibg5FeI+urz+nBlEuEv+YzPILKeS+LkqaIznnH5OEo
+=7nJk
+-----END PGP SIGNATURE-----
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
+}