Add missing patch for gnustep-make 2, bug #197777

Package-Manager: portage-2.1.3.18

4 files changed, 189 insertions, 14 deletions

diff --git a/gnustep-apps/preferences/ChangeLog b/gnustep-apps/preferences/ChangeLog
index 950568340f49..0b1ea870dc72 100644
--- a/gnustep-apps/preferences/ChangeLog
+++ b/gnustep-apps/preferences/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-apps/preferences
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preferences/ChangeLog,v 1.10 2007/09/11 12:49:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preferences/ChangeLog,v 1.11 2007/11/06 16:09:48 voyageur Exp $
+
+  06 Nov 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/preferences-gnustep-make2.patch,
+  preferences-1.3.0_pre20061204-r1.ebuild:
+  Add missing patch for gnustep-make 2, bug #197777
 
 *preferences-1.3.0_pre20061204-r1 (11 Sep 2007)
 
diff --git a/gnustep-apps/preferences/Manifest b/gnustep-apps/preferences/Manifest
index 7996e51073cd..83f5e6a1d6c3 100644
--- a/gnustep-apps/preferences/Manifest
+++ b/gnustep-apps/preferences/Manifest
@@ -2,15 +2,19 @@ AUX Preferences-nocreate-extra-dirs.patch 834 RMD160 48fb4865faf37094377de9a5f0e
 MD5 cd4414200232647c1f3402bbc6ec2e5d files/Preferences-nocreate-extra-dirs.patch 834
 RMD160 48fb4865faf37094377de9a5f0e41f35e4fb71f7 files/Preferences-nocreate-extra-dirs.patch 834
 SHA256 13660d5203e91d4f722f734667697782d99f58e3f9d9034408fc37e7b77804fa files/Preferences-nocreate-extra-dirs.patch 834
+AUX preferences-gnustep-make2.patch 6155 RMD160 73a6bbb672cca121c9defd940c12c4e485539548 SHA1 8604af899f3de5a7e7e0106216c3159e0e717e61 SHA256 bdfd2a89c7215bb32686bd53ed9c85a4b45ab9ba629b4e8c87363b7878de8cc3
+MD5 eb1227109d0ba1336827f607c7d7a1e3 files/preferences-gnustep-make2.patch 6155
+RMD160 73a6bbb672cca121c9defd940c12c4e485539548 files/preferences-gnustep-make2.patch 6155
+SHA256 bdfd2a89c7215bb32686bd53ed9c85a4b45ab9ba629b4e8c87363b7878de8cc3 files/preferences-gnustep-make2.patch 6155
 DIST preferences-1.3.0_pre20061204.tar.gz 230142 RMD160 aed6d4f3739456f2f0afd01deee993b77db339ac SHA1 647633e5580f198984dd338843de391a682ba858 SHA256 af60134c5eeb7ed52b7209aacbc93ce64b9526c56a9ca2351c9bd9b872f2dbd7
-EBUILD preferences-1.3.0_pre20061204-r1.ebuild 807 RMD160 015e674b47b5f0a8557d2d771f6db821e53b3535 SHA1 9c0f00a038b1f10062af76fa864a9ee622e01ffb SHA256 2aaf0ee5d17972421cec5c24eb3e9d2e21226099d93670e6cf76ffd147a3d123
-MD5 9e4bac21deb19368dc57bcb6163ecbf3 preferences-1.3.0_pre20061204-r1.ebuild 807
-RMD160 015e674b47b5f0a8557d2d771f6db821e53b3535 preferences-1.3.0_pre20061204-r1.ebuild 807
-SHA256 2aaf0ee5d17972421cec5c24eb3e9d2e21226099d93670e6cf76ffd147a3d123 preferences-1.3.0_pre20061204-r1.ebuild 807
-MISC ChangeLog 2790 RMD160 796e7161d9b33c2c87643742b11b7e2aff519e02 SHA1 0426aa1e756a6c4ece447bbb0a99f3565c5ea744 SHA256 c07d645da14ee8f9452da12f5e932064414832eb1ac4d334ad919b9ea7bfd1a4
-MD5 6c4feb61ebc3dc7b7283eb88292b7ea7 ChangeLog 2790
-RMD160 796e7161d9b33c2c87643742b11b7e2aff519e02 ChangeLog 2790
-SHA256 c07d645da14ee8f9452da12f5e932064414832eb1ac4d334ad919b9ea7bfd1a4 ChangeLog 2790
+EBUILD preferences-1.3.0_pre20061204-r1.ebuild 864 RMD160 49f5ed78d22f937c8b51863e8cbd824571e76696 SHA1 912d6922998206a318b9a14e89dcfd1b9235d017 SHA256 836a0289443e8a77b68a2cce07910ab804302c009aa41c435b742dfd52094c18
+MD5 48dcd0be2ef6ce64d70f32b124a12a67 preferences-1.3.0_pre20061204-r1.ebuild 864
+RMD160 49f5ed78d22f937c8b51863e8cbd824571e76696 preferences-1.3.0_pre20061204-r1.ebuild 864
+SHA256 836a0289443e8a77b68a2cce07910ab804302c009aa41c435b742dfd52094c18 preferences-1.3.0_pre20061204-r1.ebuild 864
+MISC ChangeLog 2983 RMD160 b6be7180dd625c0e039a196749c329cc0641da5e SHA1 4a81db972ef4df19ceab754c0cd1f3d37933717b SHA256 e267374020416390c3a39cd68b0e3253d8c0b4196699c1a1daf89f588fd6e474
+MD5 df22db6fe56f6014a07342ce9a0eb4d0 ChangeLog 2983
+RMD160 b6be7180dd625c0e039a196749c329cc0641da5e ChangeLog 2983
+SHA256 e267374020416390c3a39cd68b0e3253d8c0b4196699c1a1daf89f588fd6e474 ChangeLog 2983
 MISC metadata.xml 250 RMD160 1e810b97cf4a0aa8eb23f0db01a96b07597f00f0 SHA1 d34d99059006068469a3a7fe30becf541b3f3d44 SHA256 e89d5a930413b1bf0e0a7b4e25cd119b59815acf3ac65a87d8cfef9db357b1a8
 MD5 205bf7503c7223e7915354f26ba3ecf3 metadata.xml 250
 RMD160 1e810b97cf4a0aa8eb23f0db01a96b07597f00f0 metadata.xml 250
diff --git a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
new file mode 100644
index 000000000000..3ac6a7c4f248
--- /dev/null
+++ b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
@@ -0,0 +1,164 @@
+diff -Naur Preferences.orig/GNUmakefile Preferences/GNUmakefile
+--- Preferences.orig/GNUmakefile	2004-06-11 00:38:31.000000000 +0200
++++ Preferences/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -55,7 +55,7 @@
+ export TOP_SRCDIR :=	$(CURDIR)/../..
+ endif
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ #
+ # Resource files
+diff -Naur Preferences.orig/GNUmakefile.preamble Preferences/GNUmakefile.preamble
+--- Preferences.orig/GNUmakefile.preamble	2007-11-06 15:49:02.000000000 +0100
++++ Preferences/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -37,7 +37,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ #ADDITIONAL_INSTALL_DIRS += \
+diff -Naur Preferences.orig/Modules/Colors/GNUmakefile Preferences/Modules/Colors/GNUmakefile
+--- Preferences.orig/Modules/Colors/GNUmakefile	2006-09-03 19:15:12.000000000 +0200
++++ Preferences/Modules/Colors/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME=		Colors
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ Colors_LANGUAGES= \
+ 	English
+diff -Naur Preferences.orig/Modules/Colors/GNUmakefile.preamble Preferences/Modules/Colors/GNUmakefile.preamble
+--- Preferences.orig/Modules/Colors/GNUmakefile.preamble	2004-06-11 00:33:55.000000000 +0200
++++ Preferences/Modules/Colors/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile Preferences/Modules/Defaults/GNUmakefile
+--- Preferences.orig/Modules/Defaults/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Defaults/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -2,10 +2,10 @@
+ 
+ BUNDLE_NAME=		Defaults
+ BUNDLE_EXTENSION=	.prefs
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ Defaults_LANGUAGES= \
+ 	English
+diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile.preamble Preferences/Modules/Defaults/GNUmakefile.preamble
+--- Preferences.orig/Modules/Defaults/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Defaults/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Font/GNUmakefile Preferences/Modules/Font/GNUmakefile
+--- Preferences.orig/Modules/Font/GNUmakefile	2005-10-12 02:02:36.000000000 +0200
++++ Preferences/Modules/Font/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME=		Font
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ Font_LANGUAGES=	\
+ 	English \
+diff -Naur Preferences.orig/Modules/Font/GNUmakefile.preamble Preferences/Modules/Font/GNUmakefile.preamble
+--- Preferences.orig/Modules/Font/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Font/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile Preferences/Modules/Keyboard/GNUmakefile
+--- Preferences.orig/Modules/Keyboard/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Keyboard/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -3,10 +3,10 @@
+ BUNDLE_NAME=		Keyboard
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ Keyboard_LANGUAGES= \
+ 	English
+diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile.preamble Preferences/Modules/Keyboard/GNUmakefile.preamble
+--- Preferences.orig/Modules/Keyboard/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Keyboard/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
+diff -Naur Preferences.orig/Modules/Time/GNUmakefile Preferences/Modules/Time/GNUmakefile
+--- Preferences.orig/Modules/Time/GNUmakefile	2003-08-16 19:19:29.000000000 +0200
++++ Preferences/Modules/Time/GNUmakefile	2007-11-06 15:48:49.000000000 +0100
+@@ -2,10 +2,10 @@
+ 
+ BUNDLE_NAME=		Time
+ BUNDLE_EXTENSION=	.prefs
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
+ 
+ FRAMEWORKS= PrefsModule
+-include $(TOP_SRCDIR)/Backbone.make
++
+ 
+ Time_LANGUAGES= \
+ 	English
+diff -Naur Preferences.orig/Modules/Time/GNUmakefile.preamble Preferences/Modules/Time/GNUmakefile.preamble
+--- Preferences.orig/Modules/Time/GNUmakefile.preamble	2003-08-16 19:35:57.000000000 +0200
++++ Preferences/Modules/Time/GNUmakefile.preamble	2007-11-06 15:48:49.000000000 +0100
+@@ -34,7 +34,7 @@
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
++
+ 
+ # Additional directories to be created during installation
+ ADDITIONAL_INSTALL_DIRS +=
diff --git a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild b/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
index ae232e69a4ef..b73e1f337681 100644
--- a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
+++ b/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild,v 1.1 2007/09/11 12:49:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild,v 1.2 2007/11/06 16:09:48 voyageur Exp $
 
 inherit gnustep-2
 
@@ -19,11 +19,13 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/Preferences-nocreate-extra-dirs.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/Preferences-nocreate-extra-dirs.patch
+	epatch "${FILESDIR}"/${PN}-gnustep-make2.patch
 }
 
 src_install() {
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_Library}"/Colors
-	gnustep_base_src_install
+#	egnustep_env
+	dodir ${GNUSTEP_SYSTEM_LIBRARY}/Colors
+	gnustep-base_src_install
 }