Fix compilation with clang, drop old version

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

5 files changed, 40 insertions, 38 deletions

diff --git a/gnustep-apps/price/ChangeLog b/gnustep-apps/price/ChangeLog
index 836d750c5f66..fb8c2936f79c 100644
--- a/gnustep-apps/price/ChangeLog
+++ b/gnustep-apps/price/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-apps/price
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/price/ChangeLog,v 1.24 2011/12/21 08:47:43 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/price/ChangeLog,v 1.25 2012/02/09 17:28:32 voyageur Exp $
+
+  09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -price-0.9.1.ebuild,
+  price-1.0.0.ebuild, +files/price-1.0.0-PRCustTraceEdges_include.patch:
+  Fix compilation with clang, drop old version
 
   21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> price-1.0.0.ebuild:
   x86 stable wrt bug #393935
diff --git a/gnustep-apps/price/Manifest b/gnustep-apps/price/Manifest
index dc2063666363..057efa4711dd 100644
--- a/gnustep-apps/price/Manifest
+++ b/gnustep-apps/price/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX price-1.0.0-PRCustTraceEdges_include.patch 954 RMD160 6d948d650ce40323e60ce9a84e2c110fd7cb4224 SHA1 e5a2c34ff39ef8e240432c967e02bd0c302b1b21 SHA256 18da1c1212850d6f3b6606b9c97a60c72982f176750bbfb562c8c6e9e457c8c3
 DIST PRICE-0.8.3.tar.gz 169438 RMD160 58ae573e3582e09a7f5f3ab06d29188d25bad6da SHA1 b36905429a577ece7ec8c26263b0c4b460019e3d SHA256 54b3c68e61073c3868ff9aa842d67aafa7a98e4510de9586095f88172431be75
-DIST PRICE-0.9.1.tar.gz 211166 RMD160 99aa3f2e3365ed453afc83db3047109e4e36ce72 SHA1 71cf6cc0c8d2c2972e8fac1984919623dad0a23a SHA256 77db94aa27a4b6c42c4f2a62cdeca5915ba0f332af4052918cc7f8a82dae6f9f
 DIST PRICE-1.0.0.tar.gz 251299 RMD160 51d5a296a5eee5a0fabe459fb4267b1c24a1ef95 SHA1 f9a50492266291be0e1f1e50ebce970354190198 SHA256 a010d51561ccb53dfe0a0bfd8c196c5afb64f5cc4f2d42bc78cd3c0896480c0e
 EBUILD price-0.8.3.ebuild 723 RMD160 93b702c360d9b4b3ab8bd5080eacc386eaf46bfb SHA1 70e1ebbc3a88c789996f34137e76daee6e942135 SHA256 881f26385b13ec6da611bb80bc164445475900d933dc0630565b309257b2d211
-EBUILD price-0.9.1.ebuild 728 RMD160 3c393a971fc34ce64df32b736c77fc862134803f SHA1 923fa56c9d80f34cee108a8ed3ec0b3f6636022b SHA256 9b72297d232d8823b0904887e34cd3f11e2be46dbc19528aa2e2da99db50ba33
-EBUILD price-1.0.0.ebuild 561 RMD160 430c6cd2d68abc48040ab7ac6705678149582d80 SHA1 b5eba7470eeb4bd7f8078e4b9bf4367cbb807e4a SHA256 8fa4c90f49f473bf818c9730dcb3c7944c1a80c344d15179cc79e341d0beaec0
-MISC ChangeLog 3038 RMD160 d4d076b1c500b6d7a7ce3e0bb79cd912e7fd968e SHA1 57694ed4a0ffcb3f6fd5e070886f063ca732c199 SHA256 fa69c4b14df1b17a9c7f0607666f391d49e9f5b0681178c4587b497af3674a94
+EBUILD price-1.0.0.ebuild 636 RMD160 251ebe21b9043323b828df1980f28ae23f6be369 SHA1 bf45f603ae009269aa445857c7b7ebc0ad2d2c87 SHA256 a4ece2ce3e98f35ded73a4c2671fa497e4980fe4d915375baf1bae58c6b116aa
+MISC ChangeLog 3233 RMD160 97d7b540a41fe5e7a14ff88c4277a17226c65d8d SHA1 2f844f11302eae7263c4e776f73ab0383c77f5dd SHA256 e0d95e54e5cdbe065e93c03b88a5e1a5cc03b4c3d0619b3b48eb80e15c9d0b55
 MISC metadata.xml 528 RMD160 e216c1d4b47491f4b98507822f0046568d180465 SHA1 a727e664703e86d81c9397d6dfb28e884396d7cf SHA256 92ba6937bd208da667d39d254bc5841cce4daf66283df67d3f83ed5adbd84618
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7xnTYACgkQuUQtlDBCeQLjVACfXoHYN0AmO18T/XyIPZ4PcXgn
-01QAnA82f6/OhXoV1oT9vuMN+jFx5Pxg
-=pPeA
+iF4EAREIAAYFAk80Ak4ACgkQFYEBGcdFJfKLfwD/QGkpNIbJydhh3U4nQsktzTJr
+5d4SSj9PEf8Gw4ATnAIBAKyERtI/vdpAgFu4GTh62MoGbdoIjqqeuvRF0NezRW6U
+=Fa/E
 -----END PGP SIGNATURE-----
diff --git a/gnustep-apps/price/files/price-1.0.0-PRCustTraceEdges_include.patch b/gnustep-apps/price/files/price-1.0.0-PRCustTraceEdges_include.patch
new file mode 100644
index 000000000000..d071192ac892
--- /dev/null
+++ b/gnustep-apps/price/files/price-1.0.0-PRCustTraceEdges_include.patch
@@ -0,0 +1,20 @@
+--- PRCustTraceEdges.h	2008/08/21 21:31:07	1.9
++++ PRCustTraceEdges.h	2011/04/06 12:59:03	1.10
+@@ -3,7 +3,7 @@
+ //  PRICE
+ //
+ //  Created by Riccardo Mottola on Fri Mar 19 2004.
+-//  Copyright (c) 2004 Carduus. All rights reserved.
++//  Copyright (c) 2004-2011 Carduus. All rights reserved.
+ //
+ // This application is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ // This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+@@ -11,7 +11,7 @@
+ #import <AppKit/AppKit.h>
+ #import "PRProgressAction.h"
+ #import "PRImage.h"
+-
++#import "PRMedian.h"
+ 
+ @interface PRCustTraceEdges : PRProgressAction
+ {
diff --git a/gnustep-apps/price/price-0.9.1.ebuild b/gnustep-apps/price/price-0.9.1.ebuild
deleted file mode 100644
index e0acfd3d40a8..000000000000
--- a/gnustep-apps/price/price-0.9.1.ebuild
+++ /dev/null
@@ -1,25 +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/price/price-0.9.1.ebuild,v 1.1 2010/01/05 10:52:52 voyageur Exp $
-
-EAPI=2
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Mixmatching #include and #import on limits.h leads to bug #278160
-	sed -i -e 's/#import <limits.h>/#include <limits.h>/' *.m || die "sed failed"
-}
diff --git a/gnustep-apps/price/price-1.0.0.ebuild b/gnustep-apps/price/price-1.0.0.ebuild
index b3c0d39ba42c..a4498ecbe0d8 100644
--- a/gnustep-apps/price/price-1.0.0.ebuild
+++ b/gnustep-apps/price/price-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# 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/price/price-1.0.0.ebuild,v 1.4 2011/12/21 08:47:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/price/price-1.0.0.ebuild,v 1.5 2012/02/09 17:28:32 voyageur Exp $
 
 EAPI=2
 inherit gnustep-2
@@ -18,3 +18,7 @@ DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-PRCustTraceEdges_include.patch
+}