Fix objc2 support, bug #374813. Remove old

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

5 files changed, 79 insertions, 58 deletions

diff --git a/gnustep-apps/gorm/ChangeLog b/gnustep-apps/gorm/ChangeLog
index 4f5cb0bfe015..596ad594c5fc 100644
--- a/gnustep-apps/gorm/ChangeLog
+++ b/gnustep-apps/gorm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-apps/gorm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/ChangeLog,v 1.39 2011/08/12 18:54:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/ChangeLog,v 1.40 2011/08/19 09:31:31 voyageur Exp $
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> -gorm-1.2.8.ebuild,
+  -gorm-1.2.10.ebuild, gorm-1.2.12.ebuild,
+  +files/gorm-1.2.12-objc2_support.patch:
+  Fix objc2 support, bug #374813. Remove old
 
   12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> gorm-1.2.8.ebuild,
   gorm-1.2.10.ebuild, gorm-1.2.12.ebuild:
diff --git a/gnustep-apps/gorm/files/gorm-1.2.12-objc2_support.patch b/gnustep-apps/gorm/files/gorm-1.2.12-objc2_support.patch
new file mode 100644
index 000000000000..a3a6b6b36926
--- /dev/null
+++ b/gnustep-apps/gorm/files/gorm-1.2.12-objc2_support.patch
@@ -0,0 +1,71 @@
+--- apps/gorm/trunk/GormCore/GormClassManager.m	2010/09/16 04:57:56	31358
++++ apps/gorm/trunk/GormCore/GormClassManager.m	2010/09/16 05:04:00	31359
+@@ -690,7 +690,7 @@
+     }
+ 
+   actions = [self allActionsForClassNamed: className];
+-  while (actions == nil && (theClass = class_get_super_class(theClass)) != nil
++  while (actions == nil && (theClass = class_getSuperclass(theClass)) != nil
+     && theClass != [NSObject class])
+     {
+       className = NSStringFromClass(theClass);
+@@ -813,7 +813,7 @@
+     }
+ 
+   outlets = [self allOutletsForClassNamed: className];
+-  while (outlets == nil && (theClass = class_get_super_class(theClass)) != nil
++  while (outlets == nil && (theClass = class_getSuperclass(theClass)) != nil
+     && theClass != [NSObject class])
+     {
+       className = NSStringFromClass(theClass);
+@@ -885,7 +885,7 @@
+ 
+       if (theClass != nil)
+ 	{
+-	  theClass = class_get_super_class(theClass);
++	  theClass = class_getSuperclass(theClass);
+ 	  if (theClass != nil && theClass != [NSObject class])
+ 	    {
+ 	      NSString			*name;
+--- apps/gorm/trunk/GormCore/GormObjectInspector.m	2010/09/16 04:57:56	31358
++++ apps/gorm/trunk/GormCore/GormObjectInspector.m	2010/09/16 05:04:00	31359
+@@ -223,17 +223,13 @@
+ 
+       while (c != nil && c != [NSObject class])
+ 	{
+-	  struct objc_method_list	*mlist = c->methods;
+-
+-	  while (mlist != 0)
+-	    {
+-	      struct objc_method	*methods = &mlist->method_list[0];
+-	      int			count = mlist->method_count;
++	      unsigned int		count;
++	      Method			*methods = class_copyMethodList(c, &count);
+ 	      int			i;
+ 
+ 	      for (i = 0; i < count; i++)
+ 		{
+-		  SEL		sSel = methods[i].method_name;
++		  SEL		sSel = method_getName(methods[i]);
+ 		  NSString	*set = NSStringFromSelector(sSel);
+ 
+ 		  /*
+@@ -246,7 +242,7 @@
+ 		    && [sets containsObject: set] == NO)
+ 		    {
+ 		      char		tmp[[set cStringLength]+1];
+-		      const char	*tInfo = methods[i].method_types;
++		      const char	*tInfo = method_getTypeEncoding(methods[i]);
+ 		      NSString		*type = nil;
+ 		      NSString		*get;
+ 		      SEL		gSel;
+@@ -323,8 +319,7 @@
+ 			}
+ 		    }
+ 		}
+-	      mlist = mlist->method_next;
+-	    }
++	  free(methods);
+ 	  c = [c superclass]; 
+ 	}
+       [sets sortUsingSelector: @selector(compare:)];
diff --git a/gnustep-apps/gorm/gorm-1.2.10.ebuild b/gnustep-apps/gorm/gorm-1.2.10.ebuild
deleted file mode 100644
index 2d8027c198c9..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.10.ebuild,v 1.2 2011/08/12 18:54:15 xarthisius Exp $
-
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.16.0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		"${S}"/Documentation/GNUmakefile
-}
diff --git a/gnustep-apps/gorm/gorm-1.2.12.ebuild b/gnustep-apps/gorm/gorm-1.2.12.ebuild
index 2feeeb94da29..d01b8d00e661 100644
--- a/gnustep-apps/gorm/gorm-1.2.12.ebuild
+++ b/gnustep-apps/gorm/gorm-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.12.ebuild,v 1.3 2011/08/12 18:54:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.12.ebuild,v 1.4 2011/08/19 09:31:31 voyageur Exp $
 
 EAPI=3
 inherit gnustep-2
@@ -18,6 +18,7 @@ DEPEND=">=gnustep-base/gnustep-gui-0.18.0"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-objc2_support.patch
 	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
 		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
 		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
diff --git a/gnustep-apps/gorm/gorm-1.2.8.ebuild b/gnustep-apps/gorm/gorm-1.2.8.ebuild
deleted file mode 100644
index ac1bb84107de..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.8.ebuild,v 1.5 2011/08/12 18:54:15 xarthisius Exp $
-
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.16.0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		"${S}"/Documentation/GNUmakefile
-}