Fix Makefiles, bug #206546

Package-Manager: portage-2.1.4

5 files changed, 163 insertions, 13 deletions

diff --git a/gnustep-libs/gdl2/ChangeLog b/gnustep-libs/gdl2/ChangeLog
index 4be1badb1241..5985713eead1 100644
--- a/gnustep-libs/gdl2/ChangeLog
+++ b/gnustep-libs/gdl2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-libs/gdl2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/ChangeLog,v 1.10 2007/12/08 18:01:38 voyageur Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/ChangeLog,v 1.11 2008/01/20 23:39:38 voyageur Exp $
+
+  20 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/gdl2-0.11.0-NSMutableDictionary.patch,
+  +files/gdl2-0.11.0-makefile.patch, gdl2-0.11.0.ebuild:
+  Fix Makefiles (and disable tools compilation), bug #206546
+  Fix compilation with unstable gnustep
 
 *gdl2-0.11.0 (08 Dec 2007)
 
diff --git a/gnustep-libs/gdl2/Manifest b/gnustep-libs/gdl2/Manifest
index b3a23daa2cb8..1ce2112e2f69 100644
--- a/gnustep-libs/gdl2/Manifest
+++ b/gnustep-libs/gdl2/Manifest
@@ -1,12 +1,20 @@
+AUX gdl2-0.11.0-NSMutableDictionary.patch 347 RMD160 88ba98e93ca849d3fae3063a8d7e4c1704eb2cbb SHA1 efc8b245cc5a0a31721ce26f63b374cfb56ce655 SHA256 50fd4d3425a94b727fceb3214adae89a4942580318951b6c157046604bdd3f94
+MD5 732d1c2ad0c71e61f0d5757f44d7fc77 files/gdl2-0.11.0-NSMutableDictionary.patch 347
+RMD160 88ba98e93ca849d3fae3063a8d7e4c1704eb2cbb files/gdl2-0.11.0-NSMutableDictionary.patch 347
+SHA256 50fd4d3425a94b727fceb3214adae89a4942580318951b6c157046604bdd3f94 files/gdl2-0.11.0-NSMutableDictionary.patch 347
+AUX gdl2-0.11.0-makefile.patch 6060 RMD160 4f20cc0ecbc6f3092613828b73bae305db497b1b SHA1 72a15284525aa3bd85cb9946965fe8ad188c0837 SHA256 5edba4fcce54f21c7fb970ed770f7f7623948c4e9eb4bfd1736968d78e025f4f
+MD5 84e1e5e2904d286889aa512c9bf0c5e3 files/gdl2-0.11.0-makefile.patch 6060
+RMD160 4f20cc0ecbc6f3092613828b73bae305db497b1b files/gdl2-0.11.0-makefile.patch 6060
+SHA256 5edba4fcce54f21c7fb970ed770f7f7623948c4e9eb4bfd1736968d78e025f4f files/gdl2-0.11.0-makefile.patch 6060
 DIST gnustep-dl2-0.11.0.tar.gz 637481 RMD160 e25033a1ed7f78648f26294395d015806aafbf2a SHA1 7f0aa8e641b5d04ddd1e4b8f283de98969c27fd1 SHA256 287ea01c9ea6ad5f3c0ec28d2f0bb1320c451cf317966be34b097308f0cabff2
-EBUILD gdl2-0.11.0.ebuild 647 RMD160 aca1a9e8e5fb189d8b37f46ae520ccbe5416c8eb SHA1 4cf38c1126c799acc6b1001fecdf3d7d50172e0a SHA256 b8f7905365092235ba4dee772f5d51a013519f28f71b88792ca933db3d8e239c
-MD5 66f1672b4b788f9c68708ce82e0f477a gdl2-0.11.0.ebuild 647
-RMD160 aca1a9e8e5fb189d8b37f46ae520ccbe5416c8eb gdl2-0.11.0.ebuild 647
-SHA256 b8f7905365092235ba4dee772f5d51a013519f28f71b88792ca933db3d8e239c gdl2-0.11.0.ebuild 647
-MISC ChangeLog 1934 RMD160 72e488116f09ea9dae9e0aba879325fc6bdffa43 SHA1 eda4b56bf9bc4fa0711e7f645692d1f0e87dcb6d SHA256 21ddfd1634ef97c359c58cf922757f78f49b88161f431c15dde97cb03b5e498e
-MD5 232e6ab277fcf59c9dc114daff4eb68e ChangeLog 1934
-RMD160 72e488116f09ea9dae9e0aba879325fc6bdffa43 ChangeLog 1934
-SHA256 21ddfd1634ef97c359c58cf922757f78f49b88161f431c15dde97cb03b5e498e ChangeLog 1934
+EBUILD gdl2-0.11.0.ebuild 789 RMD160 5f5d828803c838b9969398c13625d776a8ada596 SHA1 2bad62a28c310d6aea334de22e43fc5c3e039695 SHA256 eb7b98e7f6f1af8cfc05b2a4a148cfe8fa45ba48d6fff7fc4cbe89c0d7fb2edd
+MD5 660156846c8a3494336187ade10e2ee1 gdl2-0.11.0.ebuild 789
+RMD160 5f5d828803c838b9969398c13625d776a8ada596 gdl2-0.11.0.ebuild 789
+SHA256 eb7b98e7f6f1af8cfc05b2a4a148cfe8fa45ba48d6fff7fc4cbe89c0d7fb2edd gdl2-0.11.0.ebuild 789
+MISC ChangeLog 2196 RMD160 e019d5212cdd6bd459bc2bed6a72dc3c39516281 SHA1 32c999111a0bff54a2cb97a9f96f40a756f50b2b SHA256 bbfa25b5f0ea64ea2923be30da0558a472a8a67002918e7b26073c1071318741
+MD5 0384757967592b7fae518b7f67c521a3 ChangeLog 2196
+RMD160 e019d5212cdd6bd459bc2bed6a72dc3c39516281 ChangeLog 2196
+SHA256 bbfa25b5f0ea64ea2923be30da0558a472a8a67002918e7b26073c1071318741 ChangeLog 2196
 MISC metadata.xml 838 RMD160 e9e51fb5a125c803d7ff347abc5cf6a73357d748 SHA1 62d2611e3038959fdec763c4578306720badf283 SHA256 cb0eb0ba21a31e3babef1a5cb31b860cc652ab919f45f8269c78cc06d85b52ce
 MD5 1eb1f72afe7dffe6b50bd5ec3c874b39 metadata.xml 838
 RMD160 e9e51fb5a125c803d7ff347abc5cf6a73357d748 metadata.xml 838
diff --git a/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch b/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch
new file mode 100644
index 000000000000..8e1a63bc8259
--- /dev/null
+++ b/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch
@@ -0,0 +1,10 @@
+--- gnustep-dl2-0.11.0/EOControl/EOClassDescription.h.orig	2008-01-20 17:40:22.000000000 +0100
++++ gnustep-dl2-0.11.0/EOControl/EOClassDescription.h	2008-01-20 17:40:24.000000000 +0100
+@@ -39,6 +39,7 @@
+ 
+ @class NSDictionary;
+ @class NSFormatter;
++@class NSMutableDictionary;
+ @class EOEditingContext;
+ @class EOGlobalID;
+ @class EORelationship;
diff --git a/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch b/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch
new file mode 100644
index 000000000000..e67463842ca3
--- /dev/null
+++ b/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch
@@ -0,0 +1,118 @@
+diff -Naur gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile gnustep-dl2-0.11.0/DBModeler/GNUmakefile
+--- gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/DBModeler/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
+@@ -30,7 +30,7 @@
+ DBModeler_SUBPROJECTS=Inspectors
+ 
+ ADDITIONAL_INCLUDE_DIRS+=-I../
+-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
+ ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler
+ 
+ $(APP_NAME)_RESOURCE_FILES =			\
+diff -Naur gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble gnustep-dl2-0.11.0/EOAccess/Makefile.preamble
+--- gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOAccess/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
+@@ -75,7 +75,7 @@
+ 
+ ADDITIONAL_NATIVE_LIBS += EOControl
+ 
+-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl
++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl
+ 
+ ifeq ($(FOUNDATION_HAS_KVC), yes)
+         ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1
+diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile
+--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
+@@ -40,7 +40,7 @@
+ LoginPanel_INCLUDE_DIRS = -I.. -I../../..
+ 
+ ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
+-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
++override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
+ 
+ ifneq ($(FOUNDATION_LIB),gnu)
+ LoginPanel_OBJC_LIBS += -lgnustep-baseadd
+diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble
+--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
+@@ -57,7 +57,7 @@
+ 
+ # Libraries linked to the framework
+ ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
+-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
+ ifneq ($(FOUNDATION_LIB),gnu)
+ LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
+ endif
+diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in
+--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in	2008-01-21 00:20:04.000000000 +0100
+@@ -30,7 +30,7 @@
+ LIBRARIES_DEPEND_UPON+=@SQLITE3_LIBS@
+ FRAMEWORK_NAME=SQLite3EOAdaptor
+ 
+-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
+ ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
+ ADDITIONAL_INCLUDE_DIRS+=-I../../
+ 
+diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile
+--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ LoginPanel_INCLUDE_DIRS=-I.. -I../../../
+ ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
+-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
++override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
+ 
+ ifneq ($(FOUNDATION_LIB),gnu)
+ LoginPanel_OBJC_LIBS+=-lgnustep-baseadd
+diff -Naur gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble gnustep-dl2-0.11.0/EOInterface/Makefile.preamble
+--- gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOInterface/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
+@@ -64,6 +64,6 @@
+ LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
+ endif
+ 
+-ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess
++override ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess
+ 
+ ADDITIONAL_NATIVE_LIBS += EOControl EOAccess
+diff -Naur gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble gnustep-dl2-0.11.0/EOModeler/Makefile.preamble
+--- gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/EOModeler/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
+@@ -72,6 +72,6 @@
+ LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
+ endif
+ 
+-ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl
++override ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl
+ 
+ ADDITIONAL_NATIVE_LIBS += EOControl EOAccess
+diff -Naur gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile
+--- gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
+@@ -31,7 +31,7 @@
+ GDL2_PRINCIPAL_CLASS = GDL2Palette
+ 
+ ADDITIONAL_INCLUDE_DIRS+=-I../
+-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
+ ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler 
+ 
+ GDL2_RESOURCE_FILES=		\
+diff -Naur gnustep-dl2-0.11.0.orig/GNUmakefile.in gnustep-dl2-0.11.0/GNUmakefile.in
+--- gnustep-dl2-0.11.0.orig/GNUmakefile.in	2008-01-21 00:19:57.000000000 +0100
++++ gnustep-dl2-0.11.0/GNUmakefile.in	2008-01-21 00:21:51.000000000 +0100
+@@ -36,7 +36,7 @@
+ #
+ # The list of subproject directories
+ #
+-SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
++SUBPROJECTS = EOControl EOAccess EOAdaptors
+ 
+ ifeq ($(GUI_MAKE_LOADED),yes)
+ SUBPROJECTS += EOInterface EOModeler DBModeler  GDL2Palette
diff --git a/gnustep-libs/gdl2/gdl2-0.11.0.ebuild b/gnustep-libs/gdl2/gdl2-0.11.0.ebuild
index dbab22ee1c55..3f3d059dd596 100644
--- a/gnustep-libs/gdl2/gdl2-0.11.0.ebuild
+++ b/gnustep-libs/gdl2/gdl2-0.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/gdl2-0.11.0.ebuild,v 1.1 2007/12/08 18:01:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/gdl2-0.11.0.ebuild,v 1.2 2008/01/20 23:39:38 voyageur Exp $
 
 inherit gnustep-2
 
@@ -18,5 +18,13 @@ S=${WORKDIR}/${MY_P}
 
 DEPEND="!gnustep-apps/sope
 	postgres? ( dev-db/libpq )
-	sqlite? ( dev-db/sqlite )"
+	sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-NSMutableDictionary.patch
+}