Drop unused include (removed from recent gnustep base), fix bug #327357

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

diff --git a/gnustep-libs/pantomime/ChangeLog b/gnustep-libs/pantomime/ChangeLog
index b032eb6fe3a4504eb347df055b79c317e8228bc6..baa88ae496c8a5dc971cd90e86e1094ebb97a908 100644 (file)
--- a/gnustep-libs/pantomime/ChangeLog
+++ b/gnustep-libs/pantomime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-libs/pantomime
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.23 2009/07/07 15:53:18 voyageur Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.24 2010/07/07 20:52:11 voyageur Exp $
+
+  07 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  pantomime-1.2.0_pre3-r1.ebuild,
+  +files/pantomime-1.2.0_pre3-gscategories.patch:
+  Drop unused include (removed from recent gnustep base), fix bug #327357
 
 *pantomime-1.2.0_pre3-r1 (07 Jul 2009)
 

diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
index 9486778c3c6af954c30d75ac7525e122e8237fcf..8a388e3d670a23ebf5b35ada8e931953492a36c9 100644 (file)
--- a/gnustep-libs/pantomime/Manifest
+++ b/gnustep-libs/pantomime/Manifest
@@ -1,5 +1,6 @@
+AUX pantomime-1.2.0_pre3-gscategories.patch 505 RMD160 b483df23f60004b6c27ae946ab02ea0210926d2a SHA1 1de8aca67002c9a18b885d9178f6748d1790b048 SHA256 550e9d053a02b2578cde8eee53fcdadc6e89ee33c2c17ca3d2b5e536b3d22231
 DIST Pantomime-1.2.0pre3.tar.gz 441478 RMD160 25c397080f0826d7b266e018246658707e9bbd00 SHA1 beddf538d239513bdd46f67db04e9b4d4bd7441c SHA256 84227a08ca9131f14fdc6aa1365b15d75d82ca84fc3ceaec2d936f38d38f2ff2
-EBUILD pantomime-1.2.0_pre3-r1.ebuild 923 RMD160 b804cd0e737ed13270fd6cb1244f1b2040d11906 SHA1 8e9072aeb4cc5ce9f37b2f16e2f02c3ffd64c40b SHA256 b9e2b7f00e916e6b4a77535478245c93c7d8df2fd795663d9a5a39ce4ecf9ffa
+EBUILD pantomime-1.2.0_pre3-r1.ebuild 976 RMD160 21ae54d8f5df5585d09f96c8a922fe8977fc067b SHA1 1b294305a1817b1747d693af19cc4f7630c89400 SHA256 547d91301449e59ed310e0a84a57fda0dea918fe6d8a17186bbf1af346188885
 EBUILD pantomime-1.2.0_pre3.ebuild 759 RMD160 6489b600f35fd58f17c17eeb32383caa35c85b82 SHA1 7e2d35be0744372a600dc4377d61c67712d09f55 SHA256 6a631674b5fe40126d443ebd7226454c2dadd674c34898a3430682bd57522d72
-MISC ChangeLog 5904 RMD160 a7c2b9deabb627017c086ded760919717eb6c04d SHA1 c0be2ed8d238cf8aed014a4a3cd99012ffe37720 SHA256 ecebb6e2cee022bd5ff97dc3675e783bbcef9946b51aed007381a55f1c85e2ef
+MISC ChangeLog 6118 RMD160 442061de1e0c76f3c847604ace60a1d4daf31136 SHA1 dabb97bf64a225542314857005c046a6eac99e6c SHA256 fea624b16ea09794afad7c3e2a75532c6768d996a44b257d7bfc25de2ba33ecf
 MISC metadata.xml 344 RMD160 fae1e70aaada0c8823cb30814c08b1b1f6937c52 SHA1 99b4ad0b6758e72d0b38918a71978fc367394996 SHA256 c36bad9168193fc14d310f43ef9745ef8e43bebd3d3a83a9958d4dd534b1a058

diff --git a/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch b/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch
new file mode 100644 (file)
index 0000000..eb00d02
--- /dev/null
+++ b/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch
@@ -0,0 +1,12 @@
+diff -Naur Pantomime.orig/Framework/Pantomime/NSString+Extensions.m Pantomime/Framework/Pantomime/NSString+Extensions.m
+--- Pantomime.orig/Framework/Pantomime/NSString+Extensions.m   2010-07-07 22:46:19.000000000 +0200
++++ Pantomime/Framework/Pantomime/NSString+Extensions.m        2010-07-07 22:47:16.000000000 +0200
+@@ -42,8 +42,6 @@
+ #ifdef MACOSX
+ #include <CoreFoundation/CFString.h>
+ #include <CoreFoundation/CFStringEncodingExt.h>
+-#else
+-#include <GNUstepBase/GSCategories.h>
+ #endif
+ 
+ #include <ctype.h>

diff --git a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild b/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild
index 93bce84e3c6ba0a5451a4b3389d977caabd4a885..2a364549dae1c8ba35c965ee9ab0c6168644736d 100644 (file)
--- a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild
+++ b/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild,v 1.1 2009/07/07 15:53:18 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild,v 1.2 2010/07/07 20:52:11 voyageur Exp $
 
 EAPI=2
-inherit gnustep-2
+inherit eutils gnustep-2
 
 MY_PN=${PN/p/P}
 
@@ -22,6 +22,7 @@ DEPEND="dev-libs/openssl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-gscategories.patch
        sed -i -e "s|ADDITIONAL_LDFLAGS|LIBRARIES_DEPEND_UPON|" \
                Framework/Pantomime/GNUmakefile || die "as-needed sed failed"
 }