Merged from main overlay 11:26

svn path=/prefix-overlay/; revision=27

14 files changed, 454 insertions, 19 deletions

diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
index 959f6a2..6715474 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,2 +1,2 @@
 DIST gorm-1.2.1.tar.gz 620438 RMD160 fb6db48dfd42a9c98137e9ed7cb48466dfeb6241 SHA1 42d27bfb0ce7862fec2e006db71be57d8de2ea09 SHA256 b127fdb566bf9e8e8cda9423730a2d9c5c295a3b9895f5d9bdcbcb41ec041f09
-EBUILD gorm-1.2.1.ebuild 1101 RMD160 0a0dd423ea15bf5bbdceb0ae5243e14e9a1af98d SHA1 8ddeff08ba5fe5292a28e1873d4509658e429d65 SHA256 e10fa3cad1ff923f9243e4ba767febc5e6a546d1581140b904295cd4eab2b638
+EBUILD gorm-1.2.1.ebuild 1102 RMD160 a342544e8b753927f0d3feb685f532373d1f42e2 SHA1 be58872fc7a26d6bfa6ddd0b6794c73fe73c7748 SHA256 5ea0c608a738e72b6ce04d630f617809f199546def172cc9092d6b321e692bca
diff --git a/gnustep-apps/gorm/gorm-1.2.1.ebuild b/gnustep-apps/gorm/gorm-1.2.1.ebuild
index b79c619..c8d0857 100644
--- a/gnustep-apps/gorm/gorm-1.2.1.ebuild
+++ b/gnustep-apps/gorm/gorm-1.2.1.ebuild
@@ -17,7 +17,7 @@ DEPEND="${GS_DEPEND}
 	doc? ( sys-apps/sed )"
 RDEPEND="${GS_RDEPEND}"
 
-egnustep_install_domain "Local"
+egnustep_install_domain "System"
 
 src_unpack() {
 	unpack ${A}
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index cd18aa8..db07271 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,2 +1,3 @@
+AUX gworkspace-0.8.5-rpath.patch 2425 RMD160 e941cd704c512bb7b4371a9084735ec880f14828 SHA1 407ae008adec7c2e5e06c11cc0531e4c8fdb3729 SHA256 1492560792a91b609377f826a5692efc148f2aaf9377048a639c303f22e7555d
 DIST gworkspace-0.8.5.tar.gz 2398566 RMD160 36857b2982c705219ab993ea4d92f46d3f72e4df SHA1 be26797188a2a804f9b1359546b9de1617981222 SHA256 839c2ce59301211d68e0391862a05eec48c38158cabd840f2f9e8a4d6cabdeea
-EBUILD gworkspace-0.8.5.ebuild 2123 RMD160 c876ce77e899856f7e76af4684e725b7895dc0f0 SHA1 c774b201a3cc6da0c1d26e3c9a22554a3707aab5 SHA256 e01708b555341adb74b4b9beed1a2d000f760e8dfe7a1a1fca0f4141ee3ccb9d
+EBUILD gworkspace-0.8.5.ebuild 1198 RMD160 8c11c7194ba22af5dcd1833cd8d18e533d3270a4 SHA1 21ecc34d916f7d663a6e396d59708e0ef97f967b SHA256 96c6b5dffe658f588c1b9008100487d0750a807ac095559f9ea6e07de87dd953
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.8.5-rpath.patch b/gnustep-apps/gworkspace/files/gworkspace-0.8.5-rpath.patch
new file mode 100644
index 0000000..ebb0520
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.8.5-rpath.patch
@@ -0,0 +1,46 @@
+diff -Naur GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble GWMetadata/gmds/mdextractor/GNUmakefile.preamble
+--- GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble	2007-02-23 14:14:52.000000000 +0100
++++ GWMetadata/gmds/mdextractor/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -12,6 +12,7 @@
+ 
+ ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
+ ADDITIONAL_LIB_DIRS += -L../../../DBKit/$(GNUSTEP_OBJ_DIR)   
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+ 
+ # Additional LDFLAGS to pass to the linker
+ # ADDITIONAL_LDFLAGS += 
+diff -Naur GWMetadata.old/gmds/mdfind/GNUmakefile.preamble GWMetadata/gmds/mdfind/GNUmakefile.preamble
+--- GWMetadata.old/gmds/mdfind/GNUmakefile.preamble	2007-02-23 14:14:50.000000000 +0100
++++ GWMetadata/gmds/mdfind/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -16,6 +16,8 @@
+ 
+ # Additional library directories the linker should search
+ ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../DBKit/$(GNUSTEP_OBJ_DIR)
+                       
+ 
+ ADDITIONAL_TOOL_LIBS +=
+diff -Naur GWMetadata.old/GNUmakefile.preamble GWMetadata/GNUmakefile.preamble
+--- GWMetadata.old/GNUmakefile.preamble	2007-02-23 14:14:55.000000000 +0100
++++ GWMetadata/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -15,7 +15,7 @@
+ ADDITIONAL_LDFLAGS +=  
+ 
+ # Additional library directories the linker should search
+-ADDITIONAL_LIB_DIRS += 
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/0
+                       
+ 
+ ADDITIONAL_TOOL_LIBS +=
+diff -Naur GWMetadata.old/MDFinder/GNUmakefile.preamble GWMetadata/MDFinder/GNUmakefile.preamble
+--- GWMetadata.old/MDFinder/GNUmakefile.preamble	2007-02-23 14:14:44.000000000 +0100
++++ GWMetadata/MDFinder/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -13,6 +13,7 @@
+ 
+ ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
+ ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../DBKit/$(GNUSTEP_OBJ_DIR)
+ 
+ # Additional LDFLAGS to pass to the linker
+ # ADDITIONAL_LDFLAGS += 
diff --git a/gnustep-apps/gworkspace/gworkspace-0.8.5.ebuild b/gnustep-apps/gworkspace/gworkspace-0.8.5.ebuild
index 77eafd9..f0500a0 100644
--- a/gnustep-apps/gworkspace/gworkspace-0.8.5.ebuild
+++ b/gnustep-apps/gworkspace/gworkspace-0.8.5.ebuild
@@ -14,34 +14,30 @@ KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="${IUSE} pdfkit doc"
+IUSE="${IUSE} pdf doc"
 DEPEND="${GS_DEPEND}
-	pdfkit? ( =gnustep-libs/pdfkit-0.9* )
+	pdf? ( >=gnustep-libs/pdfkit-0.9_pre )
 	gnustep-apps/systempreferences
-	>=dev-db/sqlite-3.2.8
-	!gnustep-apps/desktop
-	!gnustep-apps/recycler"
+	>=dev-db/sqlite-3.2.8"
 RDEPEND="${GS_RDEPEND}
-	pdfkit? ( =gnustep-libs/pdfkit-0.9* )
-	gnustep-apps/systempreferences
-	>=dev-db/sqlite-3.2.8
 	!gnustep-apps/desktop
 	!gnustep-apps/recycler"
 
 egnustep_install_domain "System"
 
-src_compile() {
-	egnustep_env
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	# Non-flattened env
-	export CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Library/Headers -I$GNUSTEP_LOCAL_ROOT/Library/Headers -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO -I$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS -I$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
-	export LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries -L$GNUSTEP_LOCAL_ROOT/Library/Libraries -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$LIBRARY_COMBO -L$GNUSTEP_LOCAL_ROOT/Library/Libraries/$LIBRARY_COMBO -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO -L$GNUSTEP_LOCAL_ROOT/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
+	epatch ${FILESDIR}/${P}-rpath.patch
+}
 
-	econf || die "configure failed"
-	egnustep_make || die "make failed"
+src_compile() {
+	egnustep_env
+	econf --with-inotify 
+	egnustep_make
 
 	cd ${S}/GWMetadata
-	ln -s ../DBKit
 	econf || die "GWMetadata configure failed"
 	egnustep_make || die "GWMetadata make failed"
 }
diff --git a/gnustep-apps/talksoup/Manifest b/gnustep-apps/talksoup/Manifest
new file mode 100644
index 0000000..6d499c5
--- /dev/null
+++ b/gnustep-apps/talksoup/Manifest
@@ -0,0 +1,3 @@
+AUX talksoup-1.0_alpha1-make2_support.patch 13992 RMD160 0e7c8c6228ebfadbf7520d891eade6c1535c2886 SHA1 ee72e52ab75756b7b9f8b880b88c6fc06c53dbdb SHA256 f6a0a3cfc8922af32c4b4fb291e52a8aa2e141fb6ac8edcd417400a4c6b9c848
+DIST TalkSoup-1.0alpha.tar.bz2 251150 RMD160 3c2d741b7b2af11925d3706232f127a38930337b SHA1 04abef6126bef15c7a6999d8d6381f76608b06aa SHA256 537c81a5707dbf6118b594eaeafac428bb7a016ee7f53391861211cab05c81dc
+EBUILD talksoup-1.0_alpha1.ebuild 715 RMD160 c0c513fd8a48714c1587049199e0ce44ee0c98a7 SHA1 6b529fa4c491a24bc55748a0492a5c6d446f6552 SHA256 5d10ece2fd71b269bed30e70c7636b64fd67ce1ac59c9e6c0785e7ef566ddc13
diff --git a/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch b/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch
new file mode 100644
index 0000000..520ca7a
--- /dev/null
+++ b/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch
@@ -0,0 +1,270 @@
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile	2007-05-12 16:31:15.000000000 +0200
+@@ -8,9 +8,9 @@
+ endif
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ DCCSupport_OBJC_FILES = DCCSupport.m DCCObject.m DCCSender.m DCCGetter.m
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Debold_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Decolorizer_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Dereverse_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Deunderline_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Emoticon_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -8,9 +8,9 @@
+ endif
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Highlighting_OBJC_FILES = Highlighting.m 
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ KeepAlive_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Logging_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ MessageInTab_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ MessageOutTab_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ PrivateBeep_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile
+--- TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
+ endif
+ 
+ Skeleton_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile
+--- TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Input
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Input
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Input
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Input
+ endif
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile
+--- TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
+ endif
+ 
+ Colorizer_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile
+--- TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
+ endif
+ 
+ Piper_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile
+--- TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -4,9 +4,9 @@
+ BUNDLE_EXTENSION =
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
+ endif
+ 
+ Skeleton_LANGUAGES = English
+diff -Naur TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile
+--- TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
++++ TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
+@@ -3,9 +3,9 @@
+ BUNDLE_NAME = GNUstepOutput
+ 
+ ifeq ($(OBJC_RUNTIME_LIB), apple)
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Output
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Output
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Output
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Output
+ endif
+ 
+ BUNDLE_EXTENSION =
diff --git a/gnustep-apps/talksoup/talksoup-1.0_alpha1.ebuild b/gnustep-apps/talksoup/talksoup-1.0_alpha1.ebuild
new file mode 100644
index 0000000..d5573b4
--- /dev/null
+++ b/gnustep-apps/talksoup/talksoup-1.0_alpha1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/talksoup/talksoup-1.0_alpha1.ebuild,v 1.1 2006/06/25 14:16:27 grobian Exp $
+
+inherit gnustep-2
+
+MY_P="TalkSoup-1.0alpha"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="IRC client for GNUstep"
+HOMEPAGE="http://talksoup.aeruder.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-1"
+
+IUSE=""
+DEPEND="${GS_DEPEND}
+	>=gnustep-libs/netclasses-1.05"
+RDEPEND="${GS_RDEPEND}
+	>=gnustep-libs/netclasses-1.05"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-make2_support.patch
+}
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
new file mode 100644
index 0000000..76092b2
--- /dev/null
+++ b/gnustep-apps/terminal/Manifest
@@ -0,0 +1,2 @@
+DIST terminal-0.9.5_pre20060324.tar.bz2 64141 RMD160 c38df5e80b705c349370165db7ff49398894e167 SHA1 1f3e550314c8648004391dafa99d14b2e330ad2d SHA256 7a893eaefcfa80b89fbf083899d7b6ebc85ce6e3559d62b946a7b8ca685680e4
+EBUILD terminal-0.9.5_pre20060324.ebuild 591 RMD160 a27ce5267ee97537d5b77c02e4330459d4bd4d0a SHA1 9bd1283b05bf3d7f60d49fd13d5ec364b542836e SHA256 88df503f2efe3a6addd2cd64d659a8d65462fd4f3879ded17d6577019f492719
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild
new file mode 100644
index 0000000..5a0c166
--- /dev/null
+++ b/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild,v 1.1 2006/03/25 23:02:30 grobian Exp $
+
+inherit gnustep-2
+
+S=${WORKDIR}/${PN/t/T}
+
+DESCRIPTION="A terminal emulator for GNUstep"
+HOMEPAGE="http://www.nongnu.org/terminal/"
+SRC_URI="http://overlays.gentoo.org/svn/proj/gnustep/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+
+IUSE=""
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
diff --git a/gnustep-apps/vindaloo/Manifest b/gnustep-apps/vindaloo/Manifest
new file mode 100644
index 0000000..f7cbfb3
--- /dev/null
+++ b/gnustep-apps/vindaloo/Manifest
@@ -0,0 +1,2 @@
+DIST vindaloo-0.3_pre20070521.tar.bz2 55913 RMD160 eed7f8ee744ad29a85098410c82ac47f605c16e1 SHA1 034862c05534c4ac19d43e05ab0d963e9d0dfdd4 SHA256 15b5d3ab1bafa95c527ce22ecebf2f9f22d5f44ed7d4a5bb8cd3b9c2c0f86d1e
+EBUILD vindaloo-0.3_pre20070521.ebuild 686 RMD160 209797c30b8a1403fc93094ea815fbec1c2ad213 SHA1 8589ba854d3e154855f4ed847c83b93ec7676d69 SHA256 a00257d36dc40e9a2333fc7b605a0bba7d474ed659d6f98e9979d6a64af0d802
diff --git a/gnustep-apps/vindaloo/vindaloo-0.3_pre20070521.ebuild b/gnustep-apps/vindaloo/vindaloo-0.3_pre20070521.ebuild
new file mode 100644
index 0000000..a06f5f2
--- /dev/null
+++ b/gnustep-apps/vindaloo/vindaloo-0.3_pre20070521.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit gnustep-2
+
+S=${WORKDIR}/${PN/v/V}
+
+DESCRIPTION="An Application for displaying and navigating in PDF documents."
+
+HOMEPAGE="http://www.etoile-project.org/etoile/mediawiki/index.php?title=Applications"
+SRC_URI="http://overlays.gentoo.org/svn/proj/gnustep/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86 ~amd64"
+SLOT="0"
+
+IUSE=""
+DEPEND="${GS_DEPEND}
+	gnustep-libs/popplerkit
+	gnustep-libs/iconkit"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed  -i "s/^include.*etoile.make//" GNUmakefile
+}
diff --git a/gnustep-apps/zipper/Manifest b/gnustep-apps/zipper/Manifest
new file mode 100644
index 0000000..40bc00a
--- /dev/null
+++ b/gnustep-apps/zipper/Manifest
@@ -0,0 +1,2 @@
+DIST Zipper-1.2.tar.gz 476243 RMD160 c965b7af2f503c4701da34641fcc52b54cb45511 SHA1 e59a87347073e1be1b6d4435656c26c6751581f1 SHA256 c46453468030acb92c3ddbe2cb7b11573cc0c5ec4b8ae849541a71d38e96d012
+EBUILD zipper-1.2.ebuild 867 RMD160 3343fa4c1f51cd5cc595deb77ff17c91d8617eef SHA1 05fa1cdefd156a13c0becb56f0f5d6441fdaa281 SHA256 2de58a6baf40660b250d7cfd81db3f382c927b812091f9e9d26f31553f784c3b
diff --git a/gnustep-apps/zipper/zipper-1.2.ebuild b/gnustep-apps/zipper/zipper-1.2.ebuild
new file mode 100644
index 0000000..c1b49f8
--- /dev/null
+++ b/gnustep-apps/zipper/zipper-1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/zipper/zipper-1.1.ebuild,v 1.1 2006/03/26 09:18:32 grobian Exp $
+
+inherit gnustep-2
+
+S=${WORKDIR}/${PN/z/Z}
+
+DESCRIPTION="Zipper is a tool for inspecting and extracting compressed archives"
+HOMEPAGE="http://xanthippe.dyndns.org/Zipper/"
+SRC_URI="http://xanthippe.dyndns.org/Zipper/${P/z/Z}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND="${GS_DEPEND}
+	gnustep-libs/renaissance"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_postinst() {
+	gnustep-2_pkg_postinst
+
+	elog "Optional archives programs zipper can use:"
+	elog "app-arch/unzip	(ZIP files)"
+	elog "app-arch/lha		(LZH archives)"
+	elog "app-arch/unlzx	(Amiga LZX archives)"
+	elog "app-arch/rar		(RAR files)"
+}