Fix objc2 support, bug #374813. Remove old

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

6 files changed, 87 insertions, 71 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/Manifest b/gnustep-apps/gorm/Manifest
index 32724c1ef9d5..652efd4f1f14 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gorm-1.2.10.tar.gz 669568 RMD160 bd616a96b4cbf3337421fef6d8504a994a8aac02 SHA1 a41c9d087546c7688e1fbba1c11d1a64fcc7f785 SHA256 652979354a31d5adf30d21bfaa652a7db67624cd3020931d5b3323a55f60afcc
+AUX gorm-1.2.12-objc2_support.patch 2270 RMD160 314e20b7b65eeba051f40eb4cc7dd92158760d68 SHA1 49f84fb464704448fed7200b3bd1cd39b80a267d SHA256 deb9f4cce5240afebc48c815bd3b60a8b27ae31f2d07e287372b4be398dc8161
 DIST gorm-1.2.12.tar.gz 676832 RMD160 8719cc7ad03ee26690e6cb787cc9d08c8cc466aa SHA1 31325bbb265e965aee6ba089b5e7a6f14e795f44 SHA256 ce797dc757235e77b8065680a990207fd77a4e86ad282a44b8cf68bd23a5374b
-DIST gorm-1.2.8.tar.gz 663210 RMD160 649f1b714210fdbeb3198b7d956be43487e6b133 SHA1 c19c2f909bef121d520ff7863eadd3c6bb383391 SHA256 1384900a32838a60e152cc9e83495125e47f34f484adc6cc411b43e7d3b5b6dd
-EBUILD gorm-1.2.10.ebuild 1072 RMD160 ffc4484489fbddc334946dfc128ac5bfbe338e5a SHA1 b23edb3a60abfbe5ff9c4561ccfb4ddfce92c359 SHA256 14d2dcf86da2a84396edd3d7655b27e3541c8ec044a4c30b5989bec854c7ada0
-EBUILD gorm-1.2.12.ebuild 1054 RMD160 ecb4ebb3ba329a1abebb845764b9a914f3ec4d7a SHA1 8cbcfaa8651e5a5f83675fecda02dfda974f6a6a SHA256 ec66245cc4ddb844390605652f9db20346627a2f0a2e7fa344ae04009b098094
-EBUILD gorm-1.2.8.ebuild 1069 RMD160 61063f6ae207623ad41cb0af9efbdbb5aa5b810e SHA1 a3102bf745e6f3f939caad629498fb54c6e53e84 SHA256 7286c0172197e9c3514df08bd21ee05dc62715f25ac889ae7c07cf6afa86f590
-MISC ChangeLog 7046 RMD160 4ad9c43c70cb1987cfa0b503f65d8a46b9821930 SHA1 dae06ddb0a3001a4070483a64743ff7668748a53 SHA256 a67c823f3d52421602de7ad2bc6b6c297f71914c75c5f6ed9f8487d1d4e1a1a6
+EBUILD gorm-1.2.12.ebuild 1099 RMD160 5ef8d48c213ef2a9c791ba41f5c1a44985a440cc SHA1 193c88166bf57839ab93087a45355c9c6b409623 SHA256 6f24b7895b69741ad6ff1fe4922e54eb9b77156db9a8e2fc7d43c8507156e107
+MISC ChangeLog 7250 RMD160 b075110d8328d855d3576a4fb62c9f3a908be800 SHA1 012c3e084634f44c5df375a85a786828c67049f3 SHA256 b40bfbdd7d9336a137820a866add8a3c67b0d32624666c0dadd96f38fe8a8d6e
 MISC metadata.xml 1489 RMD160 455569c46d1d6e940732f353025fec6b071f45ed SHA1 d35deff457755a5552e28f1d0e3da77304b4f778 SHA256 33bad025558b82f9792d775fcd5a8707ffe9f7b8d4cf5a2860680161afa83080
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5Fdt4ACgkQIiMqcbOVdxTH5AP/eQk1mq1zhCzOrCS2kwOchkcz
-57ifgYM2XHyVOFhsmN6obtHOWtquoPRpBrN7MPIoi9DuVUDuzObrjUSxXQum8b3A
-rRVIReCo8fWas2W3x1E6OpHD3/hTM4eQRFlL7ENv84Wq09JDaWBuyJ6Dzx94AOj6
-0WRjb2sJKB7voJ2aUA0=
-=RW6J
+iF4EAREIAAYFAk5OLZAACgkQFYEBGcdFJfKkIwEAqM/okzgKDiXxt2N2BKV7uGU6
+GpLoNEwoo+QyzoKRg6YA/1PnVpRKfiYdGLU5Iz6FmGVfOn73SgeSpHfPMcHFOgw6
+=iylG
 -----END PGP SIGNATURE-----
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
-}