Mass Update: gnustep.eclass revamped to allow configurable root install; gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions bumped where files would change); some KEYWORDS were accidentally dropped between version bumps of packages -- this has been resolved; windowmaker correctly supports gnustep now; gnustep-funcs.eclass added -- used where info on an installed gnustep-env is needed rather than making a full GNUstep application

7 files changed, 114 insertions, 4 deletions

diff --git a/gnustep-apps/addresses/ChangeLog b/gnustep-apps/addresses/ChangeLog
index 35394b2b0586..646a1b95eeb9 100644
--- a/gnustep-apps/addresses/ChangeLog
+++ b/gnustep-apps/addresses/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-apps/addresses
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.2 2004/10/14 19:59:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.3 2004/11/12 03:49:45 fafhrd Exp $
+
+*addresses-0.4.6-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/address-user-root.patch, +files/nonflattened.patch,
+  +addresses-0.4.6-r1.ebuild, addresses-0.4.6.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *addresses-0.4.6 (14 Oct 2004)
 
diff --git a/gnustep-apps/addresses/Manifest b/gnustep-apps/addresses/Manifest
index d6938f9eecc6..c61159bf6ba5 100644
--- a/gnustep-apps/addresses/Manifest
+++ b/gnustep-apps/addresses/Manifest
@@ -1,4 +1,8 @@
-MD5 1f65ee124649b032c533b55d7cf06bb4 ChangeLog 407
-MD5 2712e4dc4aed3f46be4d7f24ca5d127e addresses-0.4.6.ebuild 700
+MD5 17c155dcfb1f3c899e8f7f0ea9a00b96 addresses-0.4.6-r1.ebuild 816
+MD5 bf01eefc4e0d9b08e29375a121d2f9e5 addresses-0.4.6.ebuild 882
+MD5 7f3a9faffdaf14bf8cfe7cd3e6978de0 ChangeLog 948
 MD5 0996c4d3fdc1150372a830b8cf6d7351 metadata.xml 492
+MD5 caa8fe8f357e0952136999cadd1cce78 files/address-user-root.patch 870
+MD5 d7cd9285dafc9723e4acfb35563654a1 files/nonflattened.patch 1520
+MD5 54b2f4dcff77fda04fd19118a505b069 files/digest-addresses-0.4.6-r1 67
 MD5 54b2f4dcff77fda04fd19118a505b069 files/digest-addresses-0.4.6 67
diff --git a/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild b/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..e3fd829923e5
--- /dev/null
+++ b/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.6-r1.ebuild,v 1.1 2004/11/12 03:49:45 fafhrd Exp $
+
+inherit gnustep eutils
+
+S=${WORKDIR}/${P/a/A}
+
+DESCRIPTION="Addresses is a Apple Addressbook work alike (standalone and for GNUMail)"
+HOMEPAGE="http://giesler.biz/bjoern/en/sw_addr.html"
+#SRC_URI="mirror://gentoo/${P/a/A}.tar.gz"
+#SRC_URI="http://dev.gentoo.org/~fafhrd/gnustep/apps/${P/a/A}.tar.gz"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/contrib/${P/a/A}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
+src_unpack() {
+	egnustep_env
+	unpack ${A}
+	cd ${S}
+	if [ -z "${GNUSTEP_FLATTENED}" ]; then
+		epatch ${FILESDIR}/nonflattened.patch
+	fi
+	epatch ${FILESDIR}/address-user-root.patch
+}
+
diff --git a/gnustep-apps/addresses/addresses-0.4.6.ebuild b/gnustep-apps/addresses/addresses-0.4.6.ebuild
index c950250991ff..504c180d4d44 100644
--- a/gnustep-apps/addresses/addresses-0.4.6.ebuild
+++ b/gnustep-apps/addresses/addresses-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.6.ebuild,v 1.2 2004/10/14 19:59:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.6.ebuild,v 1.3 2004/11/12 03:49:45 fafhrd Exp $
 
 inherit gnustep
 
@@ -19,3 +19,13 @@ IUSE="${IUSE}"
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+src_unpack() {
+	egnustep_env
+	unpack ${A}
+	cd ${S}
+	if [ -z "${GNUSTEP_FLATTENED}" ]; then
+		epatch ${FILESDIR}/nonflattened.patch
+	fi
+	epatch ${FILESDIR}/address-user-root.patch
+}
+
diff --git a/gnustep-apps/addresses/files/address-user-root.patch b/gnustep-apps/addresses/files/address-user-root.patch
new file mode 100644
index 000000000000..1e53ab02ae9f
--- /dev/null
+++ b/gnustep-apps/addresses/files/address-user-root.patch
@@ -0,0 +1,25 @@
+diff -ur Addresses-0.4.6/Frameworks/Addresses/ADLocalAddressBook.m Addresses-0.4.6-adc/Frameworks/Addresses/ADLocalAddressBook.m
+--- Addresses-0.4.6/Frameworks/Addresses/ADLocalAddressBook.m	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/Frameworks/Addresses/ADLocalAddressBook.m	2004-11-08 14:08:07.252017064 -0500
+@@ -308,8 +308,20 @@
+ + (ADAddressBook*) sharedAddressBook
+ {
+   if(!_localAB)
++  {
++    NSProcessInfo *pInfo;
++    NSDictionary *env;
++    NSMutableString *user;
++    
++    pInfo = [NSProcessInfo processInfo];
++    env = [pInfo environment];
++    user = [[[env objectForKey: @"GNUSTEP_USER_ROOT"] 
++      mutableCopy]
++        autorelease];
++    [user appendString: @"/Library/Addresses"];
+     _localAB = [[ADLocalAddressBook alloc]
+-		 initWithLocation: [self defaultLocation]];
++		 initWithLocation: user];
++  }
+   return _localAB;
+ }
+ 
diff --git a/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1 b/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1
new file mode 100644
index 000000000000..42b6dd2b2f30
--- /dev/null
+++ b/gnustep-apps/addresses/files/digest-addresses-0.4.6-r1
@@ -0,0 +1 @@
+MD5 682da8b8530e8c595c7daa46a31b0af7 Addresses-0.4.6.tar.gz 267459
diff --git a/gnustep-apps/addresses/files/nonflattened.patch b/gnustep-apps/addresses/files/nonflattened.patch
new file mode 100644
index 000000000000..2253661b1c18
--- /dev/null
+++ b/gnustep-apps/addresses/files/nonflattened.patch
@@ -0,0 +1,26 @@
+diff -ur Addresses-0.4.6/AddressManager/GNUmakefile Addresses-0.4.6-adc/AddressManager/GNUmakefile
+--- Addresses-0.4.6/AddressManager/GNUmakefile	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/AddressManager/GNUmakefile	2004-11-06 16:31:51.661209800 -0500
+@@ -23,8 +23,8 @@
+ AddressManager_LANGUAGES=Dutch English French German Spanish
+ AddressManager_OBJCFLAGS=-I../Frameworks -Wall
+ AddressManager_LDFLAGS=\
+-	-L../Frameworks/AddressView/AddressView.framework/Versions/A \
+-	-L../Frameworks/Addresses/Addresses.framework/Versions/A     \
++	-L../Frameworks/AddressView/AddressView.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO} \
++	-L../Frameworks/Addresses/Addresses.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO} \
+ 	-lAddressView -lAddresses
+ 
+ -include GNUmakefile.preamble
+diff -ur Addresses-0.4.6/Frameworks/Addresses/GNUmakefile Addresses-0.4.6-adc/Frameworks/Addresses/GNUmakefile
+--- Addresses-0.4.6/Frameworks/Addresses/GNUmakefile	2004-07-29 08:23:10.000000000 -0400
++++ Addresses-0.4.6-adc/Frameworks/Addresses/GNUmakefile	2004-11-06 16:45:42.292934584 -0500
+@@ -49,6 +49,6 @@
+ -include GNUmakefile.postamble
+ 
+ after-Addresses-install::
+-	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/Addresses \
+-	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/AddressBook
++	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/${LIBRARY_COMBO}/Addresses \
++	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/${LIBRARY_COMBO}/AddressBook
+