diff options
Diffstat (limited to 'gnustep-libs')
19 files changed, 55 insertions, 713 deletions
diff --git a/gnustep-libs/sope/ChangeLog b/gnustep-libs/sope/ChangeLog index 95f81b4..7844769 100644 --- a/gnustep-libs/sope/ChangeLog +++ b/gnustep-libs/sope/ChangeLog @@ -1,7 +1,22 @@ # ChangeLog for gnustep-libs/sope -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*sope-2.1.1 (04 Feb 2014) + + 04 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> +sope-2.1.1.ebuild, + -sope-4.9_pre200908051100.ebuild, -sope-9999.ebuild, -files, + -files/47_mod_ngobjweb.conf, -files/sope.envd, + -files/sope-r1660-LDAP_deprecated.patch, + -files/sope-r1660-MySQL4Channel.m.patch, -files/sope-r1660-NGHttp+WO.m.patch, + -files/sope-r1660-NGLogSyslogAppender.m.patch, + -files/sope-r1660-NSDictionary+KVC.patch, + -files/sope-r1660-NSNull+misc.m.patch, + -files/sope-r1660-NSZoneMallocAtomic.patch, -files/sope-r1660-SOGo-fix.patch, + -files/sope-r1660-SoOFS.patch, -files/sope-r1660-WORepetition.m.patch, + -files/sope-r1660-use_system_root.patch, metadata.xml: + Major bump with rewritten ebuild + 09 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org> sope-9999.ebuild: monotone was moved to dev-vcs diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest index f9acdce..a3d51a1 100644 --- a/gnustep-libs/sope/Manifest +++ b/gnustep-libs/sope/Manifest @@ -1,19 +1,4 @@ -AUX 47_mod_ngobjweb.conf 112 RMD160 30045d2fb17eab9fc077052c2e6aaa2f325deea3 SHA1 2947d6b7566491208174b0026add9bc6521c76b3 SHA256 14d5316e564ac542ad3245f921efb4cdbcc613b3273ba4b57968d316ee940359 -AUX sope-r1660-LDAP_deprecated.patch 318 RMD160 32c12a2a6e562d0a24baf3e68f119aee00a3d6c7 SHA1 1613cf53b3ce111873f5899e1797f03dc769084c SHA256 174f888acb7238c5db37ace476c5374a1f10fc9f99352105b13b1ee0e5826bdb -AUX sope-r1660-MySQL4Channel.m.patch 1342 RMD160 efc4bd0b3bb5eca3226418c5f845df496bb1ae8b SHA1 debf85190c199232cfc87b6c56770b21e196381d SHA256 d4a549621b1a131b4ce76d8323a28a7b09acb6f368e669c5f9fc1b490a0110bf -AUX sope-r1660-NGHttp+WO.m.patch 342 RMD160 02018ae77c6b3868b99fbfc86a1a276796242aff SHA1 f57cd6c846d3a79f4a92762a5d239c5c90a52058 SHA256 ed891bc5d9246ced89bdcd2e497709c0b078970fb9b8e7ab4e831ac17f086dc8 -AUX sope-r1660-NGLogSyslogAppender.m.patch 484 RMD160 713637e852490d7a3476dc0cc9bbec4405ee84ce SHA1 d3b3e36937c152ee7e1438344fbdc20dd60929c2 SHA256 dbba7355709a726a4e7ed03d46a759b6a8804a5ef6b9d6f45abbefa30d3d4e9f -AUX sope-r1660-NSDictionary+KVC.patch 3393 RMD160 8c5d448a9200e0c0561ea8e31528a2b8b5f85c48 SHA1 4aed6596a1e6e4fb21147edabd07142db72813d4 SHA256 a4649a486b04450846e51319ed330cfffd5de1a5200fe21fb40259418e2126d6 -AUX sope-r1660-NSNull+misc.m.patch 478 RMD160 121591b6873c32ff2d97bb6ddaa80d0db4aeeee4 SHA1 38c162f0b8741f40302be30ed018d2ffff0e9051 SHA256 3f49349059597eb91b7e5f414dd328727a5b990af162cbcfe487b324e66a650c -AUX sope-r1660-NSZoneMallocAtomic.patch 1602 RMD160 52d14f3b5fbb068ef6160e7466b0fdabcb154a10 SHA1 5f613b52bcbb9ea1fa48186b1d219f6039206fea SHA256 af90f59f72b100503f8f8a478a918e1002a3f7ef40cd2f0a03f3dcc62e35fcda -AUX sope-r1660-SOGo-fix.patch 1878 RMD160 cadd6d1d6f112c679575d579d96e6fc2f8b39ac6 SHA1 31a13a047647e2ad1eda1d7af99a8bf494b65f7c SHA256 6b39dc34b58e46bee6894706679ba16d0a3afe9ab2199ee4a495e30911c2bd34 -AUX sope-r1660-SoOFS.patch 673 RMD160 762827099907964f633a53dc699c123a915b3947 SHA1 a787d83bdcc049647c22151c1f408af8b030915b SHA256 dbeba48ba3b89971b65e0b17586766501d49cac47f96745555c7d883f27c229c -AUX sope-r1660-WORepetition.m.patch 499 RMD160 88f2a1289e9a601d2ab9c78efadf4134a572e56f SHA1 07f2fe4d3dfa50d303f0a6abd3f866202ecece6a SHA256 0bac44e6d83b4e15215c4ae0239853fd965a9926fa8e2ae6a25c86091692b77e -AUX sope-r1660-use_system_root.patch 548 RMD160 add8b03f06b20ae96676b4efe17af08e024eae4c SHA1 86d50d562f5a94d3ffbd408fd59cbec288c17eb6 SHA256 6ac0f18cd2b39ae40b490f0e61952f6c7eccdc7939a4c7f844d2a3967abf2e64 -AUX sope.envd 78 RMD160 6eea98d1769582cfe59f8bceee2b693fdb644f25 SHA1 a62803c8fded1cec5c6588fb5eb6e7b7302ae47b SHA256 856ba9e8d7892c0287fef0e57f3e5537cce4578c4be3c9910db4f145f860a608 -DIST SOGo-1.1.0.tar.gz 3613661 RMD160 b6fd66c0825f34e3fbc12d23c9b8c144a5b9cd65 SHA1 0e19f79fd764e9deba14a6346636b7ee86832014 SHA256 950e1a954d8905e187e09336893c50b3c7a16de42ada5c50932766974d5e7a13 -DIST sope-trunk-r1660-200908051100.tar.gz 4261964 RMD160 588e35075319983f226b15fd6b07c8765054cf22 SHA1 9633265ce04b4df496457ad6ffbd6ade1e6d7cfa SHA256 45ff87319267882b21516091d6e812de8e548356774dafaa8b59c0fb6f6adb9b -EBUILD sope-4.9_pre200908051100.ebuild 6806 RMD160 ce99d764b80f2d385b14b7345aec7075d4d05bc7 SHA1 ab6c23c5d4e41741fea4e4ecd46410ac6c5d5856 SHA256 2f10056befaa959232ce7faaed8d9ba8d8e3f9810a6cd336745c44ad559260fb -EBUILD sope-9999.ebuild 7518 RMD160 0fd259ed2d36cb127c2039519b52f48901b27c7a SHA1 3c53b98b5c8368e54e49e541db945a11b686d578 SHA256 f0d98cfc925824120c23fa1131b0842e78ac671033cdedafb1f3e4e5c57cfc7d -MISC ChangeLog 1352 RMD160 4bc7696d9a5b04ec28c53241fd5c1fd76066b737 SHA1 069ec6944a3405ff2260ee886f7512e0e4ab87ba SHA256 57637081551b717d40ff57c8f3788b3761e9a125fb3e66aaa16fe2ae3bf426f6 -MISC metadata.xml 706 RMD160 18fd70a1bccb6068c67a4b3f7ac20edaa8d8242e SHA1 53ea5d3b07c4078e9ee22b6621574043196b1fe8 SHA256 51ecf43fc7e0c56c3c1cdd1150a6b649678284d21c6519d0d960bebd66505e39 +DIST SOPE-2.1.1.tar.gz 2256297 SHA256 f9b9e5a056b7d318b5ba34826e8c199421718708ae31e94714a0a6f36f74355e SHA512 f1581772d3b893ce4e1c50db9099698bc7095aa90a7d69a92d658b90afa35a16b4d20c870ebd6fddeb09a50bf4de7918a5163835f4201248d346e728d5f04880 WHIRLPOOL c8b690467028447b33b093e820868f8e5df2fa27083f055d11fa84517917f153bee9249cdfc558ca2522dcf1f0f64b8bbfd6c3fecc8b108e903f2fa020beaa8e +EBUILD sope-2.1.1.ebuild 797 SHA256 7090ced16c975dcc817858fa15da7125f3a3ca99fbd7b46bbb7752fa557f4cea SHA512 23ff976449ee81de088703c35610ee1391603ec091c7931197d1481d87e519b8dbba3f44559e2b14da3aa6b624468a2e920a64d1871f5e54595b4894b52309c7 WHIRLPOOL eb7a4b3a1724ffff438af96876f324266222fb3031b7e202a5062a647297f852f9798c3e5cdd351b629f3c417db2559ad87e103f10cbbcf495fe9ca685873061 +MISC ChangeLog 2069 SHA256 37d0b99acc252739317bf8e877a0cfd71b762ed0b2b8995f8260f3fc354e9284 SHA512 f97d38899bac9edfa73df186baf80bf7a1d14089cebc3059baff42d8f023bb0089d66bb413d723e01d2be963d99c4b89662a318fb8a212c33c54cff82c02f2e9 WHIRLPOOL 5792192d34f09b6a95b16d7af85fec68bdb12caf23ff93d5041c206a2250809820fd190ef4be22d9514ebb450a9e200bcf1a7fb6ca261c6bdb6546297c40a049 +MISC metadata.xml 538 SHA256 abd85b369bd30229dc03b1032d04f29b900a793dca4d6b3dd0a582a9f25b426e SHA512 9c8b205c66f7f2bdd525b8dd2d5565e8c7fff65e43d4fcf3c152f1301101e988d700ea8dac2e5186fc854436308cc890cef5d3dffa7f4b41f4344a455631580e WHIRLPOOL 7452efe1975238d70b80ce29b5e971803ab59b43a2c837c5ae6721438b740d44400ca445c59547108502f0915a10ecb225b76bc3573cda3c726fe3e12adcc4ed diff --git a/gnustep-libs/sope/files/47_mod_ngobjweb.conf b/gnustep-libs/sope/files/47_mod_ngobjweb.conf deleted file mode 100644 index 950dbd8..0000000 --- a/gnustep-libs/sope/files/47_mod_ngobjweb.conf +++ /dev/null @@ -1,5 +0,0 @@ -<IfDefine NGOBJWEB> -LoadModule ngobjweb_module modules/mod_ngobjweb.so -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch b/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch deleted file mode 100644 index ae70279..0000000 --- a/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sope-ldap/NGLdap/common.h 2010-01-08 13:02:02.010900599 +0100 -+++ sope-ldap/NGLdap/common.h.lazyfix 2010-01-08 13:01:50.530900712 +0100 -@@ -22,6 +22,7 @@ - #ifndef __NGLdap_common_H__ - #define __NGLdap_common_H__ - -+#define LDAP_DEPRECATED 1 - #if USE_OWN_LIBLDAP - # include <sys/types.h> - # include <ldap/lber.h> diff --git a/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch b/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch deleted file mode 100644 index b7e026c..0000000 --- a/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- sope-gdl1/MySQL/MySQL4Channel.m 2009-11-28 00:43:27.731467911 +0100 -+++ sope-gdl1/MySQL/MySQL4Channel.m.new 2009-11-28 00:42:10.683968806 +0100 -@@ -634,11 +634,11 @@ - - if ((merrno = mysql_errno(self->_connection)) != 0) { - const char *error; -+ error = mysql_error(self->_connection); - - if (isDebuggingEnabled) - NSLog(@"%@ cannot use result: '%s'", self, error); - -- error = mysql_error(self->_connection); - return [MySQL4Exception exceptionWithName:@"FetchFailed" - reason:[NSString stringWithUTF8String:error] - userInfo:nil]; -@@ -763,12 +763,16 @@ - @" c_lastmodified INT NOT NULL,\n" - @" c_version INT NOT NULL,\n" - @" c_deleted INT NULL\n" -- @")"); -+ @")\n" -+ @" DEFAULT CHARACTER SET latin1\n" -+ @" DEFAULT COLLATE latin1_general_ci"); - static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ - @" c_uid VARCHAR (256) NOT NULL,\n" - @" c_object VARCHAR (256) NOT NULL,\n" - @" c_role VARCHAR (80) NOT NULL\n" -- @")"); -+ @")\n" -+ @" DEFAULT CHARACTER SET latin1\n" -+ @" DEFAULT COLLATE latin1_general_ci"); - - - (NSException *) createGCSFolderTableWithName: (NSString *) tableName - { diff --git a/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch b/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch deleted file mode 100644 index 3e69505..0000000 --- a/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./sope-appserver/NGObjWeb/NGHttp+WO.m 2009-11-28 00:17:44.981468734 +0100 -+++ ./sope-appserver/NGObjWeb/NGHttp+WO.m.new 2009-11-28 00:59:31.661468049 +0100 -@@ -383,7 +383,7 @@ - NSString *s; - unsigned urilen; - char *uribuf; -- const char *p = uribuf; -+ const char *p; - NGHashMap *map; - - if ((s = [self uri]) == nil) diff --git a/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch b/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch deleted file mode 100644 index a7f2dc9..0000000 --- a/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m 2009-11-28 00:55:21.091466955 +0100 -+++ sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m.new 2009-11-28 00:54:15.053967324 +0100 -@@ -86,7 +86,7 @@ - - formattedMsg = [self formattedEvent:_event]; - level = [self syslogLevelForLogLevel:[_event level]]; -- syslog(level, [formattedMsg cString]); -+ syslog(level, "%s", [formattedMsg cString]); - } - - - (int)syslogLevelForLogLevel:(NGLogLevel)_level { diff --git a/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch b/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch deleted file mode 100644 index 55130a5..0000000 --- a/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- sope-core/NGExtensions/FdExt.subproj/GNUmakefile 2009-11-26 00:58:48.403972479 +0100 -+++ sope-core/NGExtensions/FdExt.subproj/GNUmakefile.new 2009-11-26 01:27:23.983967320 +0100 -@@ -14,6 +14,7 @@ - NSCalendarDate+misc.m \ - NSCalendarDate+matrix.m \ - NSData+gzip.m \ -+ NSDictionary+KVC.m \ - NSData+misc.m \ - NSDictionary+misc.m \ - NSEnumerator+misc.m \ ---- sope-core/NGExtensions/FdExt.subproj/NSDictionary+KVC.m 1970-01-01 04:00:00 +0400 -+++ sope-core/NGExtensions/FdExt.subproj/NSDictionary+KVC.m.new 2008-07-04 15:03:58 +0500 -@@ -0,0 +1,57 @@ -+/* -+ Copyright (C) 2000-2008 SKYRIX Software AG -+ -+ This file is part of SOPE. -+ -+ SOPE is free software; you can redistribute it and/or modify it under -+ the terms of the GNU Lesser General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any -+ later version. -+ -+ SOPE is distributed in the hope that it will be useful, but WITHOUT ANY -+ WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -+ License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with SOPE; see the file COPYING. If not, write to the -+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -+ 02111-1307, USA. -+*/ -+ -+#if GNUSTEP_BASE_LIBRARY -+ -+#import "common.h" -+#import "NSDictionary+KVC.h" -+ -+@implementation NSDictionary(KVC) -+ -+// TODO: it should be addressed to gnustep-base -+ -+- (id)valueForUndefinedKey:(NSString *)key -+{ -+ return nil; -+} -+ -+- (id)handleQueryWithUnboundKey:(NSString *)key -+{ -+ return nil; -+} -+ -+- (void)setValue:(id)value forUndefinedKey:(NSString *)key -+{ -+ return; -+} -+ -+- (void)handleTakeValue:(id)value forUnboundKey:(NSString *)key -+{ -+ return; -+} -+ -+@end /* NSDictionary(KVC) */ -+ -+void __link_NSDictionary_KVC() { -+ __link_NSDictionary_KVC(); -+} -+ -+#endif ---- sope-core/NGExtensions/NGExtensions/NSDictionary+KVC.h 1970-01-01 04:00:00 +0400 -+++ sope-core/NGExtensions/NGExtensions/NSDictionary+KVC.h.new 2008-07-04 15:05:55 +0500 -@@ -0,0 +1,39 @@ -+/* -+ Copyright (C) 2000-2008 SKYRIX Software AG -+ -+ This file is part of SOPE. -+ -+ SOPE is free software; you can redistribute it and/or modify it under -+ the terms of the GNU Lesser General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any -+ later version. -+ -+ SOPE is distributed in the hope that it will be useful, but WITHOUT ANY -+ WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -+ License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with SOPE; see the file COPYING. If not, write to the -+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -+ 02111-1307, USA. -+*/ -+ -+#ifndef __NGExtensions_NSDictionary_KVC_H__ -+#define __NGExtensions_NSDictionary_KVC_H__ -+ -+#import <Foundation/NSDictionary.h> -+ -+@interface NSDictionary(KVC) -+ -+- (id)valueForUndefinedKey:(NSString *)key; -+ -+- (id)handleQueryWithUnboundKey:(NSString *)key; -+ -+- (void)setValue:(id)value forUndefinedKey:(NSString *)key; -+ -+- (void)handleTakeValue:(id)value forUnboundKey:(NSString *)key; -+ -+@end -+ -+#endif /* __NGExtensions_NSDictionary_KVC_H__ */ diff --git a/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch b/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch deleted file mode 100644 index 3c35153..0000000 --- a/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sope-core/NGExtensions/FdExt.subproj/NSNull+misc.m 2009-08-05 11:00:11.000000000 +0200 -+++ sope-core/NGExtensions/FdExt.subproj/NSNull+misc.m.new 2009-11-26 01:35:31.481468118 +0100 -@@ -241,7 +241,7 @@ - // But: a single space should be treated as emtpy, since this is very common - // in SQL (Sybase in special) - for (i = 0; i < len; i++) { -- if (!isspace([self characterAtIndex:i])) -+ if ([self characterAtIndex:i] != 20) // svg - return YES; - } - diff --git a/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch b/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch deleted file mode 100644 index 8c33cc3..0000000 --- a/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: sope-core/NGStreams/NGStream+serialization.m -=================================================================== ---- sope-core/NGStreams/NGStream+serialization.m (revision 1632) -+++ sope-core/NGStreams/NGStream+serialization.m (working copy) -@@ -282,7 +282,7 @@ - else { - char *result = NULL; - --#if NeXT_Foundation_LIBRARY -+#if NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY - result = NSZoneMalloc(NULL, len + 1); - #else - result = NSZoneMallocAtomic(NULL, len + 1); -Index: sope-core/NGStreams/NGGZipStream.m -=================================================================== ---- sope-core/NGStreams/NGGZipStream.m (revision 1632) -+++ sope-core/NGStreams/NGGZipStream.m (working copy) -@@ -52,7 +52,7 @@ - @"invalid compression level %i (0-9)", _level); - - self->outBufLen = 2048; --#if GNU_RUNTIME -+#if GNU_RUNTIME && !GNUSTEP_BASE_LIBRARY - self->outBuf = NSZoneMallocAtomic([self zone], self->outBufLen); - self->outp = NSZoneMallocAtomic([self zone], sizeof(z_stream)); - #else -Index: sope-core/NGStreams/NGCharBuffer.m -=================================================================== ---- sope-core/NGStreams/NGCharBuffer.m (revision 1632) -+++ sope-core/NGStreams/NGCharBuffer.m (working copy) -@@ -46,7 +46,7 @@ - // Find first power of 2 >= to requested size - for (size = 2; size < _la; size *=2); - --#if NeXT_Foundation_LIBRARY -+#if NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY - self->la = NSZoneMalloc([self zone], sizeof(LA_NGCharBuffer) * size); - #else - self->la = NSZoneMallocAtomic([self zone], diff --git a/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch b/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch deleted file mode 100644 index 77d3fcf..0000000 --- a/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- configure 2009-11-28 03:33:54.961467916 +0100 -+++ configure.new 2009-11-28 03:35:48.731467571 +0100 -@@ -330,8 +330,8 @@ - # common.make - UNAME=`uname` - if [ "X${UNAME}" = "XLinux" ];then -- UNAME=`uname -p` -- if [ ${UNAME} = x86_64 -o ${UNAME} = sparc64 -o ${UNAME} = ppc64 ];then -+ UNAME=`uname -m` -+ if [ "X${UNAME}" = "Xx86_64" -o "X${UNAME}" = "Xsparc64" -o "X${UNAME}" = "Xppc64" ];then - cfgwrite "CGS_LIBDIR_NAME:=lib64" - else - cfgwrite "CGS_LIBDIR_NAME:=lib" -@@ -343,7 +343,8 @@ - cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/\$(CGS_LIBDIR_NAME)/" - cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR)" - cfgwrite "endif" -- cfgwrite "GNUSTEP_INSTALLATION_DOMAIN:=LOCAL" -+ cfgwrite "GNUSTEP_INSTALLATION_DOMAIN:=SYSTEM" -+ cfgwrite "GNUSTEP_WEB_APPS:=\${GNUSTEP_SYSTEM_WEB_APPS}" - cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L/usr/\$(CGS_LIBDIR_NAME)/" - - -@@ -425,6 +426,7 @@ - cd $tmpdir - cp ../maintenance/dummytool.c . - -+ local OLDLIBS="${LIBS}" - for LIB in $1;do - LIBS="$LIBS -l${LIB}" - done -@@ -447,16 +449,24 @@ - LINK_RESULT=$? - - if test $LINK_RESULT = 0; then -- echo "$2 library found: $1" -- cfgwrite "HAS_LIBRARY_$1=yes" -+ for LIB in $1;do -+ echo "$2 library found: ${LIB}" -+ cfgwrite "HAS_LIBRARY_${LIB}=yes" -+ done - else - if test "x$2" = "xrequired"; then -- echo "failed to link $2 library: $1" -+ for LIB in $1;do -+ echo "failed to link $2 library: ${LIB}" -+ cfgwrite "HAS_LIBRARY_${LIB}=no" -+ done - rm ../config.make - exit 1 - else -- echo "failed to link $2 library: $1" -- cfgwrite "HAS_LIBRARY_$1=no" -+ for LIB in $1;do -+ echo "failed to link $2 library: ${LIB}" -+ cfgwrite "HAS_LIBRARY_${LIB}=no" -+ done -+ LIBS="${OLDLIBS}" - fi - fi - diff --git a/gnustep-libs/sope/files/sope-r1660-SoOFS.patch b/gnustep-libs/sope/files/sope-r1660-SoOFS.patch deleted file mode 100644 index 9eb398a..0000000 --- a/gnustep-libs/sope/files/sope-r1660-SoOFS.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- sope-appserver/SoOFS/GNUmakefile.preamble.org 2009-11-24 15:05:35.971466918 +0100 -+++ sope-appserver/SoOFS/GNUmakefile.preamble 2009-11-24 15:04:47.001467300 +0100 -@@ -3,6 +3,7 @@ - # TODO: need to fix COMPILE_FOR_GSTEP_MAKE? - ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 - ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol -+ADDITIONAL_LDFLAGS += "-Wl,--no-as-needed" - - SOPE_ROOT=../.. - CORE_ROOT=$(SOPE_ROOT)/sope-core -@@ -83,6 +83,7 @@ - ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) - # and neither does MacOSX? ... --sope_TOOL_LIBS += -lcrypt -+$(SOPED_NAME)_TOOL_LIBS += -lcrypt -+libSoOFS_LIBRARIES_DEPEND_UPON += -lcrypt - endif - endif - diff --git a/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch b/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch deleted file mode 100644 index 53dae7a..0000000 --- a/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./sope-appserver/NGObjWeb/DynamicElements/WORepetition.m 2009-08-05 11:00:44.000000000 +0200 -+++ ./sope-appserver/NGObjWeb/DynamicElements/WORepetition.m.new 2009-11-26 01:01:30.551467024 +0100 -@@ -805,7 +805,7 @@ - - for (cnt = 0; cnt < aCount; cnt++) { - if (self->item) { -- [self->item setValue:[array objectAtIndex:cnt] -+ [self->item setValue:[[self->list valueInContext:_ctx] objectAtIndex:cnt] - inComponent:sComponent]; - } - else { diff --git a/gnustep-libs/sope/files/sope-r1660-use_system_root.patch b/gnustep-libs/sope/files/sope-r1660-use_system_root.patch deleted file mode 100644 index ab7a974..0000000 --- a/gnustep-libs/sope/files/sope-r1660-use_system_root.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2008-07-01 16:25:13.000000000 +0200 -+++ configure 2008-07-01 16:25:33.000000000 +0200 -@@ -243,9 +243,9 @@ - "x") - if test $ARG_WITH_GNUSTEP = 1; then - DARG_IS_FHS=0; -- ARG_PREFIX="$GNUSTEP_LOCAL_ROOT" -+ ARG_PREFIX="$GNUSTEP_SYSTEM_ROOT" - if test $ARG_BEQUIET != 1; then -- echo "Note: will install in GNUSTEP_LOCAL_ROOT: $ARG_PREFIX" -+ echo "Note: will install in GNUSTEP_SYSTEM_ROOT: $ARG_PREFIX" - echo "" - fi - elif test "x$ARG_FRAMEWORK_DIR" != "x"; then diff --git a/gnustep-libs/sope/files/sope.envd b/gnustep-libs/sope/files/sope.envd deleted file mode 100644 index ecba857..0000000 --- a/gnustep-libs/sope/files/sope.envd +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/usr/GNUstep/System/Tools/Admin -ROOTPATH=/usr/GNUstep/System/Tools/Admin diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml index 18bd590..4ad9c6a 100644 --- a/gnustep-libs/sope/metadata.xml +++ b/gnustep-libs/sope/metadata.xml @@ -2,8 +2,5 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnustep</herd> - <longdescription>The SOPE package is an extensive set of frameworks (16 frameworks, ~1500 classes) which form a complete Web application server environment. Besides the Apple WebObjects compatible appserver extended with Zope concepts, it contains a large set of reusable classes: XML processing (SAX2, DOM, XML-RPC), MIME/IMAP4 processing, LDAP connectivity, RDBMS connectivity, and iCalendar parsing</longdescription> - <use> - <flag name="libFoundation">Installs libFoundation, an implementation of the OpenStep Foundation API</flag> - </use> + <longdescription>SOPE is an extensive set of frameworks which form a complete Web application server environment. Besides the Apple WebObjects compatible appserver extended with Zope concepts, it contains a large set of reusable classes: XML processing (SAX, DOM, XML-RPC), MIME/IMAP4 processing, LDAP connectivity, RDBMS connectivity, and iCalendar parsing</longdescription> </pkgmetadata> diff --git a/gnustep-libs/sope/sope-2.1.1.ebuild b/gnustep-libs/sope/sope-2.1.1.ebuild new file mode 100644 index 0000000..eb047bb --- /dev/null +++ b/gnustep-libs/sope/sope-2.1.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit gnustep-2 + +DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment" +HOMEPAGE="http://www.sogo.nu/" +SRC_URI="http://www.sogo.nu/files/downloads/SOGo/Sources/SOPE-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mysql postgres sqlite" + +DEPEND="dev-libs/libxml2 + dev-libs/openssl + net-nds/openldap + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( dev-db/sqlite:3 )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/SOPE + +src_configure() { + # Non-standard configure script + ./configure \ + $(use_enable debug) \ + $(use_enable debug strip) \ + --with-gnustep || die "configure failed" +} diff --git a/gnustep-libs/sope/sope-4.9_pre200908051100.ebuild b/gnustep-libs/sope/sope-4.9_pre200908051100.ebuild deleted file mode 100644 index f26df99..0000000 --- a/gnustep-libs/sope/sope-4.9_pre200908051100.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit gnustep-base apache-module - -MY_PV="1660-200908051100" - -DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment" -HOMEPAGE="http://sope.opengroupware.org/en/index.html" -SRC_URI="http://download.opengroupware.org/nightly/sources/trunk/${PN}-trunk-r${MY_PV}.tar.gz - http://www.scalableogo.org/files/downloads/SOGo/Sources/SOGo-1.1.0.tar.gz" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache2 ldap libFoundation mysql postgres sqlite" -DEPEND="gnustep-base/gnustep-base - dev-libs/libxml2 - dev-libs/openssl - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-base ) - sqlite? ( >=dev-db/sqlite-3.0 )" -RDEPEND="${DEPEND}" - -APACHE2_MOD_DEFINE="NGOBJWEB" -APACHE2_MOD_FILE="sope-appserver/mod_ngobjweb/mod_ngobjweb.so" -APACHE2_MOD_CONF="47_mod_ngobjweb" - -S=${WORKDIR}/${PN} - -want_apache - -pkg_setup() { - gnustep-base_pkg_setup - local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)" - if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then - ewarn - ewarn "You seem to have compiled GNUstep with custom LDFLAGS:" - for foo in $(gnustep-config --variable=LDFLAGS); do - ewarn " "${foo} - done - ewarn - ewarn "SOPE is very sensitive regarding custom LDFLAGS. Especially with:" - ewarn " --add-needed" - ewarn " --as-needed" - ewarn - ewarn "If your SOPE install does not work as expected then please re-emerge SOPE" - ewarn "and your GNUstep (base and make) without any LDFLAGS before filing bugs." - ewarn - fi - append-ldflags -Wl,--no-as-needed - depend.apache_pkg_setup -} - -src_prepare() { - # http://www.scalableogo.org/english/support/faq/article/how-do-i-compile-sogo.html - epatch "${WORKDIR}"/SOGo-1.1.0/SOPE/sope-gsmake2.diff - epatch "${WORKDIR}"/SOGo-1.1.0/SOPE/sope-patchset-r1660.diff - epatch "${FILESDIR}"/${PN}-r1660-SOGo-fix.patch # Fixing stuff after SOGo patches - epatch "${FILESDIR}"/${PN}-r1660-NSZoneMallocAtomic.patch # NSZoneMalloc changed in GNUstep - epatch "${FILESDIR}"/${PN}-r1660-SoOFS.patch # libSoOFS is failing without -lcrypt - epatch "${FILESDIR}"/${PN}-r1660-WORepetition.m.patch - epatch "${FILESDIR}"/${PN}-r1660-NSDictionary+KVC.patch - epatch "${FILESDIR}"/${PN}-r1660-NSNull+misc.m.patch - epatch "${FILESDIR}"/${PN}-r1660-LDAP_deprecated.patch - - if use apache2; then - # Only add mod_ngobjweb if it is not already in SUBPROJECTS - if ! ( sed -e :a -e '/\\$/N; s/\\\n//; ta' "${S}"/sope-appserver/GNUmakefile 2>/dev/null | grep -q "^[[:space:]]*SUBPROJECTS[\t \+=].*[[:space:]]mod_ngobjweb" ); then - sed -i "/^SUBPROJECTS[\t \+=]/,/^[\t ]\{1,99\}[a-zA-Z]\{1,99\}[\t ]*$/{s/\([a-zA-Z]\)$/\1\t\\\\\n\tmod_ngobjweb/}" \ - "${S}"/sope-appserver/GNUmakefile - fi - else - # Only remove mod_ngobjweb if it is found in SUBPROJECTS - if ( sed -e :a -e '/\\$/N; s/\\\n//; ta' "${S}"/sope-appserver/GNUmakefile 2>/dev/null | grep -q "^[[:space:]]*SUBPROJECTS[\t \+=].*[[:space:]]mod_ngobjweb" ); then - sed -i "s/^[\t ]*mod_ngobjweb[\t ]*$/\n/;/^[\t ]*mod_ngobjweb[\t ]*\\\\$/d" \ - "${S}"/sope-appserver/GNUmakefile - fi - fi - - gnustep-base_src_prepare -} - -src_configure() { - egnustep_env - local myconf - if use libFoundation; then - myconf="${myconf} --frameworks=libFoundation" - cd "${S}"/libFoundation - ./configure \ - --prefix=/usr \ - $(use_enable debug) \ - --with-gnustep || die "configure libFoundation failed" - fi - cd "${S}" - ./configure \ - $(use_enable debug) \ - $(use_enable debug strip) \ - --with-gnustep ${myconf} || die "configure failed" -} - -src_compile() { - egnustep_env - local myconf - if use libFoundation; then - cd "${S}"/libFoundation - CFLAGS="${CFLAGS} -Wno-import" egnustep_make - cd "${S}" - fi - if use apache2; then - myconf="${myconf} apxs=/usr/sbin/apxs" - myconf="${myconf} apr=/usr/bin/apr-1-config" - fi - egnustep_make ${myconf} -} - -src_test() { - # SOPE tends to break horribly if gnustep-make is build with LDFLAGS such as - # -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries. - # Check if SoCore, SoOFS is correctly build/linked - local mySoCoreLDD=$(ldd -d "${S}"/sope-appserver/NGObjWeb/SoCore.sxp/SoCore 2>&1 | grep "lib\(NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local mySoOFSLDD=$(ldd -d "${S}"/sope-appserver/SoOFS/SoOFS.sxp/SoOFS 2>&1 | grep "lib\(SoOFS\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - if [ -z "${mySoCoreLDD}" -o -z "${mySoOFSLDD}" -o "${mySoCoreLDD}" != "8" -o "${mySoOFSLDD}" != "9" ]; then - ewarn - ewarn "This SOPE installtion is not correctly build. Probably you are using" - ewarn "LDFLAGS to build SOPE that are not correctly handled in SOPE or you" - ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are" - ewarn "preventing SOPE to link the needed libraries into it's own binaries." - ewarn "Please remerge gnustep-base/gnustep-make and/or SOPE with empty LDFLAGS." - ewarn - die "SOPE build is not complete (SoCore, SoOFS)" - fi - # Do the same for WEExtensions, WOExtensions, WEPrototype - local myWEExtensionsLDD=$(ldd -d "${S}"/sope-appserver/WEExtensions/WEExtensions.wox/WEExtensions 2>&1 | grep "lib\(WEExtensions\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local myWOExtensionsLDD=$(ldd -d "${S}"/sope-appserver/WOExtensions/WOExtensions.wox/WOExtensions 2>&1 | grep "lib\(W[EO]Extensions\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local myWEPrototypeLDD=$(ldd -d "${S}"/sope-appserver/WEPrototype/WEPrototype.wox/WEPrototype 2>&1 | grep "lib\(WEPrototype\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - if [ -z "${myWEExtensionsLDD}" -o -z "${myWOExtensionsLDD}" -o -z "${myWEPrototypeLDD}" -o "${myWEExtensionsLDD}" != "9" -o "${myWOExtensionsLDD}" != "10" -o "${myWEPrototypeLDD}" != "9" ]; then - ewarn - ewarn "This SOPE installtion is not correctly build. Probably you are using" - ewarn "LDFLAGS to build SOPE that are not correctly handled in SOPE or you" - ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are" - ewarn "preventing SOPE to link the needed libraries into it's own binaries." - ewarn "Please remerge gnustep-base/gnustep-make and/or SOPE with empty LDFLAGS." - ewarn - die "SOPE build is not complete (WEExtensions, WOExtensions, WEPrototype)" - fi -} - -src_install() { - newenvd "${FILESDIR}"/sope.envd 99sope \ - || die "Failed installing env.d script" - gnustep-base_src_install - use apache2 && apache-module_src_install -} - -pkg_postinst() { - gnustep-base_pkg_postinst - use apache2 && apache-module_pkg_postinst -} diff --git a/gnustep-libs/sope/sope-9999.ebuild b/gnustep-libs/sope/sope-9999.ebuild deleted file mode 100644 index 3ec5738..0000000 --- a/gnustep-libs/sope/sope-9999.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit gnustep-base apache-module flag-o-matic subversion - -ESVN_REPO_URI="http://svn.opengroupware.org/SOPE/trunk" - -DESCRIPTION="An extensive set of frameworks which form a complete Web application server environment" -HOMEPAGE="http://sope.opengroupware.org/en/index.html" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="" -IUSE="apache2 ldap libFoundation mysql postgres sqlite" -DEPEND="gnustep-base/gnustep-base - dev-libs/libxml2 - dev-libs/openssl - dev-vcs/monotone - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-base ) - sqlite? ( >=dev-db/sqlite-3.0 )" -RDEPEND="${DEPEND}" - -APACHE2_MOD_DEFINE="NGOBJWEB" -APACHE2_MOD_FILE="sope-appserver/mod_ngobjweb/mod_ngobjweb.so" -APACHE2_MOD_CONF="47_mod_ngobjweb" - -S=${WORKDIR}/${PN} - -want_apache - -pkg_setup() { - gnustep-base_pkg_setup - local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)" - if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then - ewarn - ewarn "You seem to have compiled GNUstep with custom LDFLAGS:" - for foo in $(gnustep-config --variable=LDFLAGS); do - ewarn " "${foo} - done - ewarn - ewarn "SOPE is very sensitive regarding custom LDFLAGS. Especially with:" - ewarn " --add-needed" - ewarn " --as-needed" - ewarn - ewarn "If your SOPE install does not work as expected then please re-emerge SOPE" - ewarn "and your GNUstep (base and make) without any LDFLAGS before filing bugs." - ewarn - fi - append-ldflags -Wl,--no-as-needed - depend.apache_pkg_setup -} - -src_unpack() { - subversion_src_unpack - - # SOGo Monotone - EMTN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/mtn-src" - addread "${EMTN_STORE_DIR}" - addwrite "${EMTN_STORE_DIR}" - if [ ! -d "${EMTN_STORE_DIR}" ]; then - mkdir -p "${EMTN_STORE_DIR}" || die "Can't mkdir ${EMTN_STORE_DIR}." - fi - cd "${EMTN_STORE_DIR}" || die "Can't chdir to ${EMTN_STORE_DIR}" - - if [ ! -f "db.mtn" ]; then - mtn db init --db=./db.mtn || die "Failed to initialize Monotone database" - fi - - # Pull Inverse's SOGo Monotone repository - mtn --db=./db.mtn pull inverse.ca ca.inverse.sogo || die "Failed to pull Monotone repository" - if [ ! -d "SOGo" ]; then - mtn --db=./db.mtn checkout --branch ca.inverse.sogo SOGo || die "Failed to checkout SOGo branch" - else - cd SOGo - mtn update - fi -} - -src_prepare() { - # http://www.scalableogo.org/english/support/faq/article/how-do-i-compile-sogo.html - epatch "${EMTN_STORE_DIR}"/SOGo/SOPE/sope-gsmake2.diff - epatch "${EMTN_STORE_DIR}"/SOGo/SOPE/sope-patchset-r*.diff - epatch "${FILESDIR}"/${PN}-r1660-use_system_root.patch - epatch "${FILESDIR}"/${PN}-r1660-SOGo-fix.patch - epatch "${FILESDIR}"/${PN}-r1660-SoOFS.patch # Fixing stuff after SOGo patches - epatch "${FILESDIR}"/${PN}-r1660-MySQL4Channel.m.patch # Fixing issues with primary key and UTF8 - epatch "${FILESDIR}"/${PN}-r1660-NGLogSyslogAppender.m.patch # Fixing compiler warnings - epatch "${FILESDIR}"/${PN}-r1660-NGHttp+WO.m.patch # Fixing compiler warnings - epatch "${FILESDIR}"/${PN}-r1660-LDAP_deprecated.patch # Fixing QA issues on 64 Bit - - if use apache2; then - # Only add mod_ngobjweb if it is not already in SUBPROJECTS - if ! ( sed -e :a -e '/\\$/N; s/\\\n//; ta' "${S}"/sope-appserver/GNUmakefile 2>/dev/null | grep -q "^[[:space:]]*SUBPROJECTS[\t \+=].*[[:space:]]mod_ngobjweb" ); then - sed -i "/^SUBPROJECTS[\t \+=]/,/^[\t ]\{1,99\}[a-zA-Z]\{1,99\}[\t ]*$/{s/\([a-zA-Z]\)$/\1\t\\\\\n\tmod_ngobjweb/}" \ - "${S}"/sope-appserver/GNUmakefile - fi - else - # Only remove mod_ngobjweb if it is found in SUBPROJECTS - if ( sed -e :a -e '/\\$/N; s/\\\n//; ta' "${S}"/sope-appserver/GNUmakefile 2>/dev/null | grep -q "^[[:space:]]*SUBPROJECTS[\t \+=].*[[:space:]]mod_ngobjweb" ); then - sed -i "s/^[\t ]*mod_ngobjweb[\t ]*$/\n/;/^[\t ]*mod_ngobjweb[\t ]*\\\\$/d" \ - "${S}"/sope-appserver/GNUmakefile - fi - fi - - gnustep-base_src_prepare -} - -src_configure() { - egnustep_env - local myconf - if use libFoundation; then - myconf="${myconf} --frameworks=libFoundation" - cd "${S}"/libFoundation - ./configure \ - --prefix=/usr \ - $(use_enable debug) \ - --with-gnustep || die "configure libFoundation failed" - fi - cd "${S}" - ./configure \ - $(use_enable debug) \ - $(use_enable debug strip) \ - --with-gnustep ${myconf} || die "configure failed" -} - -src_compile() { - egnustep_env - local myconf - if use libFoundation; then - cd "${S}"/libFoundation - CFLAGS="${CFLAGS} -Wno-import" egnustep_make - cd "${S}" - fi - if use apache2; then - myconf="${myconf} apxs=/usr/sbin/apxs" - myconf="${myconf} apr=/usr/bin/apr-1-config" - fi - egnustep_make ${myconf} -} - -src_test() { - # SOPE tends to break horribly if gnustep-make is build with LDFLAGS such as - # -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries. - # Check if SoCore, SoOFS is correctly build/linked - local mySoCoreLDD=$(ldd -d "${S}"/sope-appserver/NGObjWeb/SoCore.sxp/SoCore 2>&1 | grep "lib\(NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local mySoOFSLDD=$(ldd -d "${S}"/sope-appserver/SoOFS/SoOFS.sxp/SoOFS 2>&1 | grep "lib\(SoOFS\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - if [ -z "${mySoCoreLDD}" -o -z "${mySoOFSLDD}" -o "${mySoCoreLDD}" != "8" -o "${mySoOFSLDD}" != "9" ]; then - ewarn - ewarn "This SOPE installtion is not correctly build. Probably you are using" - ewarn "LDFLAGS to build SOPE that are not correctly handled in SOPE or you" - ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are" - ewarn "preventing SOPE to link the needed libraries into it's own binaries." - ewarn "Please remerge gnustep-base/gnustep-make and/or SOPE with empty LDFLAGS." - ewarn - die "SOPE build is not complete (SoCore, SoOFS)" - fi - # Do the same for WEExtensions, WOExtensions, WEPrototype - local myWEExtensionsLDD=$(ldd -d "${S}"/sope-appserver/WEExtensions/WEExtensions.wox/WEExtensions 2>&1 | grep "lib\(WEExtensions\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local myWOExtensionsLDD=$(ldd -d "${S}"/sope-appserver/WOExtensions/WOExtensions.wox/WOExtensions 2>&1 | grep "lib\(W[EO]Extensions\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - local myWEPrototypeLDD=$(ldd -d "${S}"/sope-appserver/WEPrototype/WEPrototype.wox/WEPrototype 2>&1 | grep "lib\(WEPrototype\|NG\(ObjWeb\|Mime\|Streams\|Extensions\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l) - if [ -z "${myWEExtensionsLDD}" -o -z "${myWOExtensionsLDD}" -o -z "${myWEPrototypeLDD}" -o "${myWEExtensionsLDD}" != "9" -o "${myWOExtensionsLDD}" != "10" -o "${myWEPrototypeLDD}" != "9" ]; then - ewarn - ewarn "This SOPE installtion is not correctly build. Probably you are using" - ewarn "LDFLAGS to build SOPE that are not correctly handled in SOPE or you" - ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are" - ewarn "preventing SOPE to link the needed libraries into it's own binaries." - ewarn "Please remerge gnustep-base/gnustep-make and/or SOPE with empty LDFLAGS." - ewarn - die "SOPE build is not complete (WEExtensions, WOExtensions, WEPrototype)" - fi -} - -src_install() { - newenvd "${FILESDIR}"/sope.envd 99sope \ - || die "Failed installing env.d script" - gnustep-base_src_install - use apache2 && apache-module_src_install -} - -pkg_postinst() { - gnustep-base_pkg_postinst - use apache2 && apache-module_pkg_postinst -} |