Merged from main overlay 11:26

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

44 files changed, 690 insertions, 224 deletions

diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass
index 00b6442..7ecfc90 100644
--- a/eclass/gnustep-2.eclass
+++ b/eclass/gnustep-2.eclass
@@ -20,25 +20,27 @@ fi
 #   + DEPEND="${GS_DEPEND} other/depend ..."
 #   + RDEPEND="${GS_RDEPEND} other/rdepend ..."
 
-# packages needed to build docs
+# packages needed to build (resp view) docs
 DOC_DEPEND="doc? ( virtual/tetex
 	=dev-tex/latex2html-2002*
 	>=app-text/texi2html-1.64 )"
-# packages needed to view docs
 DOC_RDEPEND="doc? ( virtual/man
 	>=sys-apps/texinfo-4.6 )"
+# packages needed to utilize .debug apps
+DEBUG_DEPEND="debug? ( >=sys-devel/gdb-6.0 )"
 # packages needed to build any gnustep package
 GNUSTEP_CORE_DEPEND="virtual/libc
 	>=sys-devel/gcc-3.3.5
 	${DOC_DEPEND}"
-# packages needed to utilize .debug apps
-DEBUG_DEPEND="debug? ( >=sys-devel/gdb-6.0 )"
 
 GS_DEPEND=">=gnustep-base/gnustep-env-0.2"
 GS_RDEPEND="${GS_DEPEND}
 	${DEBUG_DEPEND}
 	${DOC_RDEPEND}"
 
+# Where to install GNUstep
+GNUSTEP_PREFIX="/usr/GNUstep"
+
 # Ebuild function overrides
 gnustep-2_pkg_setup() {
 	if test_version_info 3.3
@@ -55,11 +57,10 @@ gnustep-2_pkg_setup() {
 }
 
 gnustep-2_src_compile() {
-	#TODO
-	# Should handle configure
-	# http://devmanual.gentoo.org/ebuild-writing/functions/src_compile/index.html
-	# gnustep-libs/netclasses for example
 	egnustep_env
+	if [ -x ./configure ]; then
+		econf || die
+	fi
 	egnustep_make || die
 }
 
@@ -72,8 +73,8 @@ gnustep-2_src_install() {
 	fi
 	# Copies "convenience scripts"
 	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
-		dodir `egnustep_install_path`/Tools/Gentoo
-		exeinto `egnustep_install_path`/Tools/Gentoo
+		dodir $(egnustep_tools_dir)/Gentoo
+		exeinto $(egnustep_tools_dir)/Gentoo
 		doexe ${FILESDIR}/config-${PN}.sh
 	fi
 }
@@ -82,41 +83,12 @@ gnustep-2_pkg_postinst() {
 	# Informs user about existence of "convenience script"	
 	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
 		einfo "Make sure to set happy defaults for this package by executing:"
-		einfo "  `egnustep_install_path`/Tools/Gentoo/config-${PN}.sh"
+		einfo "  $(egnustep_tools_dir)/Gentoo/config-${PN}.sh"
 		einfo "as the user you will run the package as."
 	fi
 }
 
-
-######################################################################################
-#TODO finish merge
-######################################################################################
-
-# Prints out the dirname of GNUSTEP_SYSTEM_ROOT, i.e., "System" is installed
-#  in egnustep_prefix
-egnustep_prefix() {
-	# Generally, only gnustep-make should be the one setting this value
-	if [ "$1" ]; then
-		__GS_PREFIX="$(dirname $1/prune)"
-		return 0
-	fi
-
-	if [ -f /etc/conf.d/gnustep.env ]; then
-		. /etc/conf.d/gnustep.env
-		if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
-			die "Please check /etc/conf.d/gnustep.env for consistency or remove it."
-		fi
-		__GS_PREFIX=$(dirname ${GNUSTEP_SYSTEM_ROOT})
-	elif [ -z "${__GS_PREFIX}" ]; then
-		__GS_PREFIX="/usr/GNUstep"
-		__GS_SYSTEM_ROOT="/usr/GNUstep/System"
-	fi
-
-	echo "${__GS_PREFIX}"
-}
-
-# Prints/sets the GNUstep install domain; Generally, this will only be
-#  "System" or "Local"
+# Prints/sets the GNUstep install domain (System/Local)
 egnustep_install_domain() {
 	if [ -z "$1" ]; then
 		echo ${__GS_INSTALL_DOMAIN}
@@ -132,32 +104,25 @@ egnustep_install_domain() {
 	fi
 }
 
-# Prints the GNUstep install path
-egnustep_install_path() {
+# Prints the GNUstep domain Tools directory
+egnustep_tools_dir() {
 	if [ "$__GS_INSTALL_DOMAIN" == "SYSTEM" ]; then
-		echo "${__GS_SYSTEM_ROOT}"
+		echo "${GNUSTEP_SYSTEM_TOOLS}"
 	elif [ "$__GS_INSTALL_DOMAIN" == "LOCAL" ]; then
-		echo "${__GS_LOCAL_ROOT}"
+		echo "${GNUSTEP_LOCAL_TOOLS}"
 	fi
 }
 
 # Clean/reset an ebuild to the installed GNUstep environment
 egnustep_env() {
-	GNUSTEP_SYSTEM_ROOT="$(egnustep_prefix)/System"
-	if [ -f ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ] ; then
-		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep-reset.sh
-		if [ -f /etc/conf.d/gnustep.env ]; then
-			. /etc/conf.d/gnustep.env
-		else
-			GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
-		fi
-		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
+	# Get additional variables
+	GNUSTEP_SH_EXPORT_ALL_VARIABLES="true"
+	if [ -f ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh ] ; then
+		. ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep-reset.sh
+		. ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh
 
-		__GS_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}
-		__GS_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}
-		__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}
-		__GS_USER_DIR=${GNUSTEP_USER_DIR}
-		__GS_USER_DEFAULTS_DIR=${GNUSTEP_USER_DEFAULTS_DIR}
+		# Needed to run installed GNUstep apps in sandbox
+		addpredict "/root/GNUstep"
 
 		# Set up common env vars for make operations
 		__GS_MAKE_EVAL=" \
@@ -180,42 +145,6 @@ egnustep_env() {
 	fi
 }
 
-# Get/Set the GNUstep system root
-egnustep_system_root() {
-	if [ "$1" ]; then
-		__GS_SYSTEM_ROOT="$(dirname $1/prune)"
-	else
-		echo ${__GS_SYSTEM_ROOT}
-	fi
-}
-
-# Get/Set the GNUstep local root
-egnustep_local_root() {
-	if [ "$1" ]; then
-		__GS_LOCAL_ROOT="$(dirname $1/prune)"
-	else
-		echo ${__GS_LOCAL_ROOT}
-	fi
-}
-
-# Get/Set the GNUstep network root
-egnustep_network_root() {
-	if [ "$1" ]; then
-		__GS_NETWORK_ROOT="$(dirname $1/prune)"
-	else
-		echo ${__GS_NETWORK_ROOT}
-	fi
-}
-
-# Get/Set the GNUstep user dir
-egnustep_user_dir() {
-	if [ "$1" ]; then
-		__GS_USER_DIR="$(dirname $1/prune)"
-	else
-		echo ${__GS_USER_DIR}
-	fi
-}
-
 # Make utilizing GNUstep Makefiles
 egnustep_make() {
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
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)"
+}
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index 8eb2260..81d78ba 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,3 +1,3 @@
-AUX config-gnustep-back-art.sh 382 RMD160 f0b2864e67a56673e48ca53dfc2aad6b29fc09a5 SHA1 ececa255316ad50a8e7e8b880a06914a824ebfa2 SHA256 6d14ed72696c65ad30bdce39aa12b11972d60dc4245f3186087f4015e984ad23
+AUX config-gnustep-back-art.sh 216 RMD160 d486da8e31ccaa6e2513b272768ef6897611208d SHA1 b84b44050ded947df6df07554d29aa5122904b26 SHA256 f3bf159b0e00a51c4ad06da4cdecde6da3aee115433f95d54de633ced47a1455
 DIST gnustep-back-0.12.0.tar.gz 853996 RMD160 ad19420127bb0e2e5f7dc9c3cf9974ea06255565 SHA1 859aef314eb9ef5cbedad9dc53a818542baa17ec SHA256 59b000aa069e2a50398b31296ce5d663f98fc8d131bfd8f3d10e29b0a5379a45
-EBUILD gnustep-back-art-0.12.0.ebuild 2176 RMD160 6a1c24e951f5db09438d21760ec56f75e509d417 SHA1 096920b7851e8203d02b6288e1cf8e2dbc1f705e SHA256 7312d3b1826b5f08822eb3cb6e145a96ce707ddd9ab71e0e891f6b7f50c036dc
+EBUILD gnustep-back-art-0.12.0.ebuild 1702 RMD160 4d599f3bc0a74eea1931533807b84b22aecc79de SHA1 63225e1e0e46439bd677e21101c1db08235909a5 SHA256 425e3ed424245acd4e08db0c06244a665eaafa09a54ffc47901c0ce3cd6aa19e
diff --git a/gnustep-base/gnustep-back-art/files/config-gnustep-back-art.sh b/gnustep-base/gnustep-back-art/files/config-gnustep-back-art.sh
index f1f02ce..61e5e06 100644
--- a/gnustep-base/gnustep-back-art/files/config-gnustep-back-art.sh
+++ b/gnustep-base/gnustep-back-art/files/config-gnustep-back-art.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-
-echo "Switching to libgnustep-art backend ..."
-echo "defaults write NSGlobalDomain GSBackend libgnustep-art"
-defaults write NSGlobalDomain GSBackend libgnustep-art
-
 echo "Setting default fonts..."
 defaults write NSGlobalDomain NSFont DejaVuSans
 defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.12.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.12.0.ebuild
index 540a8ca..2903dfd 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.12.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.12.0.ebuild
@@ -14,15 +14,10 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-PROVIDE="virtual/gnustep-back"
-
 IUSE="${IUSE} opengl xim doc"
-# from http://gnustep.made-it.com/BuildGuide/index.html#BUILDING.GNUSTEP
-# gnustep-gui, libICE, libSM, libX11, libXext, libXi, libXmu, libXt,
-# libGL, libXft, libXrender, libexpat, libfontconfig, libfreetype,
-# libart
+
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-gui-0.12
+	~gnustep-base/gnustep-gui-${PV}
 	opengl? ( virtual/opengl virtual/glu )
 	x11-libs/libICE
 	x11-libs/libSM
@@ -52,7 +47,7 @@ src_compile() {
 	use opengl && myconf="--enable-glx"
 	myconf="$myconf `use_enable xim`"
 	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art --with-name=art"
+	myconf="$myconf --enable-graphics=art"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
@@ -62,7 +57,7 @@ src_compile() {
 	cd Fonts
 	mknfonts /usr/share/fonts/dejavu/*.ttf
 	for fdir in DejaVu*; do
-		mv -v $fdir `echo $fdir | tr -d [:space:]`
+		mv -v "$fdir" `echo $fdir | tr -d [:space:]`
 	done
 }
 
@@ -70,14 +65,8 @@ src_install() {
 	egnustep_env
 
 	gnustep-2_src_install
-	cd ${S}
-	mkdir -p "${D}/$(egnustep_system_root)/Library/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/$(egnustep_system_root)/Library/Fonts"
-
-	rm -rf "${D}/$(egnustep_system_root)/var"
-
-	dosym \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-art-012.bundle" \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-art.bundle"
+	
+	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
+	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
 }
 
diff --git a/gnustep-base/gnustep-back-cairo/Manifest b/gnustep-base/gnustep-back-cairo/Manifest
index 49b5a68..c3ee110 100644
--- a/gnustep-base/gnustep-back-cairo/Manifest
+++ b/gnustep-base/gnustep-back-cairo/Manifest
@@ -1,3 +1,2 @@
-AUX config-gnustep-back-cairo.sh 184 RMD160 b0f078511aadce2746e8cc9fc504c41f0f55ccd7 SHA1 eed07fee2fd3f8fd3555ee4974e0f9f6f367060f SHA256 2dd55a88f04dd99cf36e8162cd8d967bd21a72681ace85fada3eb106e3615bac
 DIST gnustep-back-0.12.0.tar.gz 853996 RMD160 ad19420127bb0e2e5f7dc9c3cf9974ea06255565 SHA1 859aef314eb9ef5cbedad9dc53a818542baa17ec SHA256 59b000aa069e2a50398b31296ce5d663f98fc8d131bfd8f3d10e29b0a5379a45
-EBUILD gnustep-back-cairo-0.12.0.ebuild 1454 RMD160 a535ad153a494d6ba5ac588b89cc2bbc7703a7cf SHA1 67d795784a25507851cae8e971daf2ee07eb00ec SHA256 516f47478cedc311b6386933f40fead85c9a670eb7c2ddaf539de4ead81396de
+EBUILD gnustep-back-cairo-0.12.0.ebuild 1171 RMD160 251422281aa5089bc53c576deae1468671166ae2 SHA1 a9c4b9e4f7cdb3c3a880468bb5d8f28ffe8cdc70 SHA256 c3fded72b02f927471bb775a3557092fab9443ea11c2e6fedefed1788694dcc3
diff --git a/gnustep-base/gnustep-back-cairo/files/config-gnustep-back-cairo.sh b/gnustep-base/gnustep-back-cairo/files/config-gnustep-back-cairo.sh
deleted file mode 100644
index cde9ce8..0000000
--- a/gnustep-base/gnustep-back-cairo/files/config-gnustep-back-cairo.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "Switching to libgnustep-cairo backend ..."
-echo "defaults write NSGlobalDomain GSBackend libgnustep-cairo"
-defaults write NSGlobalDomain GSBackend libgnustep-cairo
-
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.0.ebuild
index 7fce2c0..56ea9be 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.0.ebuild
@@ -14,8 +14,6 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-PROVIDE="virtual/gnustep-back"
-
 IUSE="${IUSE} opengl xim doc glitz"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-gui-${PV}
@@ -33,7 +31,6 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 
 	>=media-libs/freetype-2.1.9
 	>=x11-libs/cairo-1.2.0
-	gnustep-base/mknfonts
 	!virtual/gnustep-back"
 RDEPEND="${DEPEND}
 	${DEBUG_DEPEND}
@@ -47,7 +44,7 @@ src_compile() {
 	use opengl && myconf="--enable-glx"
 	myconf="$myconf `use_enable xim`"
 	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo --with-name=cairo"
+	myconf="$myconf --enable-graphics=cairo"
 	# Seems broken for now
 	#myconf="$myconf `use_enable glitz`"
 
@@ -56,14 +53,3 @@ src_compile() {
 	egnustep_make
 
 }
-
-src_install() {
-	egnustep_env
-
-	gnustep-2_src_install
-
-	dosym \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-cairo-012.bundle" \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-cairo.bundle"
-}
-
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index c302c10..c0f8a84 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,3 +1,2 @@
-AUX config-gnustep-back-xlib.sh 181 RMD160 86c68bda088d52313c3a8f5af166edb7ba84298a SHA1 263efdd48e258a5f435fa2601804d8c62a3228cd SHA256 67ff4a0404740dbc2ffc455f8c93b9f930e48ce83856e1f26e3cdcd3901fef85
 DIST gnustep-back-0.12.0.tar.gz 853996 RMD160 ad19420127bb0e2e5f7dc9c3cf9974ea06255565 SHA1 859aef314eb9ef5cbedad9dc53a818542baa17ec SHA256 59b000aa069e2a50398b31296ce5d663f98fc8d131bfd8f3d10e29b0a5379a45
-EBUILD gnustep-back-xlib-0.12.0.ebuild 1495 RMD160 f723034494a32bf12ea757d160bd22b262b87d94 SHA1 167d0d513c46bf77b724a03b95371b0df08381d5 SHA256 747c61c8ea14b3d3f16cf2afc068548a0ba2ac203fd33f8df51b971f08378f55
+EBUILD gnustep-back-xlib-0.12.0.ebuild 1243 RMD160 afc90a2797b620cf795dce7163fa566cf55c100c SHA1 e4fd2b962810c51a61de8250bbc4ba7dcdc88f85 SHA256 c49fa0b45b9bed4947521a250076040266e793a89c6634ace04cfd4e0165807a
diff --git a/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh b/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh
deleted file mode 100644
index f81b377..0000000
--- a/gnustep-base/gnustep-back-xlib/files/config-gnustep-back-xlib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "Switching to libgnustep-xlib backend ..."
-echo "defaults write NSGlobalDomain GSBackend libgnustep-xlib"
-defaults write NSGlobalDomain GSBackend libgnustep-xlib
-
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild
index b5c773e..789e2bc 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.12.0.ebuild
@@ -10,15 +10,13 @@ DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-PROVIDE="virtual/gnustep-back"
-
 IUSE="opengl xim"
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-gui-0.11.0
+	~gnustep-base/gnustep-gui-${PV}
 	opengl? ( virtual/opengl virtual/glu )
 	x11-libs/libICE
 	x11-libs/libSM
@@ -45,19 +43,8 @@ src_compile() {
 	use opengl && myconf="--enable-glx"
 	myconf="$myconf `use_enable xim`"
 	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
+	myconf="$myconf --enable-graphics=xlib"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
 }
-
-src_install() {
-	egnustep_env
-
-	gnustep-2_src_install
-
-	dosym \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-xlib-012.bundle" \
-		"$(egnustep_system_root)/Library/Bundles/libgnustep-xlib.bundle"
-
-}
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index 790aa10..a0090a9 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,2 +1,2 @@
 AUX gnustep.env-0.2 682 RMD160 8381bfcb162c4e58d6eaa97132a267394e44c6ae SHA1 d0c179a7a297cfcd55a6a0519cfcb8f44d2e1920 SHA256 54815d6008416af573bdc7e52251957ea195709dab4d413120ba17592a791910
-EBUILD gnustep-env-0.2.ebuild 1292 RMD160 68f864b3fbe44132ac4cade6a63a5390b0dd1069 SHA1 4745058e08cf39d6ca92dc7254454064c3720308 SHA256 5d1bfdc14f28bc09cc4c16766ede052d1c4255a49883700b02225ac462cfb2b7
+EBUILD gnustep-env-0.2.ebuild 1288 RMD160 dd496236a76fd84a93ab3ff4e8f7cfbfd3288e44 SHA1 91ed092e2dd4158209a0430347bcd38103605a1e SHA256 186627d676064ec6f11695757f3e20146b910a2b4dde8642700c0d4862cf7339
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.2.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.2.ebuild
index 03c525e..1c000bb 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.2.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.2.ebuild
@@ -32,9 +32,9 @@ src_compile() {
 src_install() {
 	egnustep_env
 	newenvd ${FILESDIR}/gnustep.env-${PV} 99gnustep
-	dosed "s:XXX_GNUSTEP_USER_ROOT_XXX:~/$(egnustep_user_dir):g" /etc/env.d/99gnustep
-	dosed "s:XXX_GNUSTEP_LOCAL_ROOT_XXX:$(egnustep_local_root):g" /etc/env.d/99gnustep
-	dosed "s:XXX_GNUSTEP_NETWORK_ROOT_XXX:$(egnustep_network_root):g" /etc/env.d/99gnustep
-	dosed "s:XXX_GNUSTEP_SYSTEM_ROOT_XXX:$(egnustep_system_root):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_USER_ROOT_XXX:~/${GNUSTEP_USER_DIR}:g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_LOCAL_ROOT_XXX:${GNUSTEP_LOCAL_ROOT}:g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_NETWORK_ROOT_XXX:${GNUSTEP_NETWORK_ROOT}:g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_SYSTEM_ROOT_XXX:${GNUSTEP_SYSTEM_ROOT}:g" /etc/env.d/99gnustep
 }
 
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 007a613..2998b2c 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,6 +1,8 @@
+AUX gnustep-2.csh 544 RMD160 4240088bd1876554bd58124bb1a60ebcfff2ea9c SHA1 cfad3d606f04cb888eb9d4670aba6bf8ca52953c SHA256 19457287e4bd95557c8bc85ffa9fc60e9e8c3a50d66e451a06a0b460637288ff
+AUX gnustep-2.sh 432 RMD160 0a7ef8f038a3d99dbf552daa02f0ca6cd92cf23d SHA1 7434ffcd3f233230c2075a2968ba7a20e35705ca SHA256 a3ae2c90eb578718429754c18ffa9b960e8f7c89783327dfda7729745ae2826e
 AUX gnustep.csh 550 RMD160 9c9f95980119f326dc0435e0bd1aab22c6e215ff SHA1 6a6690ed2f6503d7d7d443a32636de08ab67afe9 SHA256 4e35fccbb237b1ab5d9a7e35cc52e1c9455223c36162314e1bbadd7ea5df1f89
 AUX gnustep.sh 445 RMD160 c7ebec6201ca3df8447a17c26d3007fc281b1141 SHA1 7d3f311acc05d839c079565e12250d2194cdbdd8 SHA256 de8869e6468c0b19eae087273d05433c1c6edbefb57d4599a4149c2a1f9e660d
 DIST gnustep-make-1.13.0.tar.gz 400157 RMD160 b1d619d7c677463bf1a4adae82a412ad95157dc2 SHA1 91f0494d58233e59254c365b338bca1bd684bea6 SHA256 d79c11bada9ccd32d0ab08a0dfbd776731b02103975a22b6b95284046b740e8f
 DIST gnustep-make-2.0.0.tar.gz 443627 RMD160 4e7afee1733a792d4f6135e676fafbf50c39a86b SHA1 cf99c0bf388f54cfeca2d8b1d6446703878548cc SHA256 7e660367e2c047279d571e03813035b999620d0a0fe01b90bdacd874358f5957
 EBUILD gnustep-make-1.13.0.ebuild 2318 RMD160 828d585acf0673ab3a98588eac10963fecfeaa0d SHA1 c5d109082f4e6b7d09cfb84a2207c77cb338ff8a SHA256 f34b757710729d081aaae1f8132a0b7d611ad7f4be192d500677f6f0a0cc3baf
-EBUILD gnustep-make-2.0.0.ebuild 2187 RMD160 196e334efb051f521b47ced4a142ad1013db0e4f SHA1 3aafad2b4cca8412aed0501171b3e8b3ec28676b SHA256 cf0452f8be55c55b671719087831d7578a5b177d83813c58560f2cb29fae40de
+EBUILD gnustep-make-2.0.0.ebuild 1605 RMD160 6ce63c6cd4501c52b3c763feb7bd2cc383633b35 SHA1 c562140fe063ec8b431e254703051ff68b02d4ba SHA256 427481657c165995ace70ef37e41249eef0ccd9e0a9950f3a9715982fb47ae55
diff --git a/gnustep-base/gnustep-make/files/gnustep-2.csh b/gnustep-base/gnustep-make/files/gnustep-2.csh
new file mode 100644
index 0000000..af75be2
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-2.csh
@@ -0,0 +1,21 @@
+#!/bin/csh
+
+if ( -e /etc/GNUstep/GNUstep.conf ) then
+    eval `sed -e '/^[^#=][^#=]*=.*$/\\!d' -e 's/^\([^#=][^#=]*\)=\(.*\)$/setenv \1 \2;/' /etc/GNUstep/GNUstep.conf`
+else
+    GNUSTEP_MAKEFILES=/usr/GNUstep/System/Library/Makefiles
+endif
+
+source $GNUSTEP_MAKEFILES/GNUstep.csh
+
+if ( -z "$GNUSTEP_IS_FLATTENED" = "no" ) then
+    set TDIR=${GNUSTEP_SYSTEM_TOOLS}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+else
+    set TDIR=${GNUSTEP_SYSTEM_TOOLS}
+endif
+
+if ( -x $TDIR/make_services ) then
+    $TDIR/make_services
+endif
+
+unset TDIR
\ No newline at end of file
diff --git a/gnustep-base/gnustep-make/files/gnustep-2.sh b/gnustep-base/gnustep-make/files/gnustep-2.sh
new file mode 100644
index 0000000..b8ceb80
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-2.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ -e /etc/GNUstep/GNUstep.conf ]
+    then
+    . /etc/GNUstep/GNUstep.conf
+else
+    GNUSTEP_MAKEFILES=/usr/GNUstep/System/Library/Makefiles
+fi
+
+. $GNUSTEP_MAKEFILES/GNUstep.sh
+
+if [ "$GNUSTEP_IS_FLATTENED" = "no" ] 
+then
+    TDIR=${GNUSTEP_SYSTEM_TOOLS}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+else
+    TDIR=${GNUSTEP_SYSTEM_TOOLS}
+fi
+
+if [ -x $TDIR/make_services ]
+    then
+    $TDIR/make_services
+fi
+
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.0.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.0.0.ebuild
index 181fd69..d3a699f 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.0.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.0.0.ebuild
@@ -27,34 +27,27 @@ pkg_setup() {
 		ewarn "gcc must be compiled with Objective-C support! See the objc USE flag."
 		die "ObjC support not available"
 	fi
-
-	# setup defaults here
-	egnustep_prefix "/usr/GNUstep"
-	egnustep_system_root "/usr/GNUstep/System"
-	egnustep_local_root "/usr/GNUstep/Local"
-	egnustep_network_root "/usr/GNUstep/Network"
-	egnustep_user_dir 'GNUstep'
 }
 
 src_compile() {
 	cd ${S}
 
 	local myconf
-	myconf="--prefix=`egnustep_prefix` --with-layout=gnustep"
-	use non-flattened && myconf="$myconf --disable-flattened --enable-multi-platform"
+	myconf="--prefix=${GNUSTEP_PREFIX} --with-layout=gnustep"
+	myconf="$myconf --enable-native-objc-exceptions"
+	use non-flattened && \
+		myconf="$myconf --disable-flattened --enable-multi-platform"
 	econf $myconf || die "configure failed"
 
-	egnustep_make
+	emake
 }
 
 src_install() {
-	. ${S}/GNUstep.sh
-
 	local make_eval="-j1"
-	use debug && make_eval="${make_eval} debug=yes"
+	use debug || make_eval="${make_eval} debug=no"
 	use verbose && make_eval="${make_eval} verbose=yes"
 
-	make ${make_eval} DESTDIR=${D} install || die "install has failed"
+	emake ${make_eval} DESTDIR=${D} install || die "install has failed"
 
 	if use doc ; then
 		cd Documentation
@@ -63,17 +56,8 @@ src_install() {
 		cd ..
 	fi
 
-	dodir /etc/conf.d
-	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_USER_DIR='$(egnustep_user_dir)'" >> ${D}/etc/conf.d/gnustep.env
-
-	insinto /etc/GNUstep
-	doins ${S}/GNUstep.conf
-
 	exeinto /etc/profile.d
-	doexe ${FILESDIR}/gnustep.sh
-	doexe ${FILESDIR}/gnustep.csh
+	doexe ${FILESDIR}/gnustep-2.sh
+	doexe ${FILESDIR}/gnustep-2.csh
 }
 
diff --git a/gnustep-libs/camaelon/Manifest b/gnustep-libs/camaelon/Manifest
index 851792e..6f448cd 100644
--- a/gnustep-libs/camaelon/Manifest
+++ b/gnustep-libs/camaelon/Manifest
@@ -1,5 +1,5 @@
-AUX config-camaelon.sh 362 RMD160 93062a340061723da0a0d34425afe3e584eac112 SHA1 b5f4b92e4bb8eb66f53e47bdd547073724657941 SHA256 3134fb9e2546e3c38f4f0a872556810519c1d3e2dcb798bd957522c54107e422
+AUX config-camaelon.sh 352 RMD160 c96d3bf786dd9098eab8525d607c62e2516bd025 SHA1 edc55f83d1d49c641afc011f1ec79ca561988f52 SHA256 fd4e8bec4e1b02d4157f0e3ea2effb23515480aa41a399e5c7443dc444be7375
 DIST IndustrialTheme.tar.bz2 49338 RMD160 794adb1bd117e038a1211c33bb9740cd1ca9be9c SHA1 b61abb20b5cfdd56851c8f102d5f0779c7f29110 SHA256 29f9c2d0599a7ca84682e406eca2a546479c8cad386f19969ba437731e2b1379
 DIST MaxCurve-0.2.tar.bz2 48965 RMD160 29b910b8d1696633727f33bd1a8de11b21b56365 SHA1 5afaa87019821949b1df0ac1e21f79a645bbce8e SHA256 808b872ba00c02616b6d9754acb1533cd9139da88c22954506d236517d0b7202
 DIST camaelon-2.0_pre20070504.tar.bz2 106158 RMD160 ec6efdfe22ffd68af56da636f80e17ffba21b1bf SHA1 69cc8285a9596a9007835a3d468d4d931f181b43 SHA256 f1ddd9a51978e9b106cb4b90d9fe6a992f4b61bfeb3eeb49defff7981d1f848b
-EBUILD camaelon-2.0_pre20070504.ebuild 1009 RMD160 7674e43dcfcd21937b321200fa30c5576827f9fb SHA1 c503a3c659c18927a74fba08bb3880b22ad1c25e SHA256 fd5017c83729e843a75a53479d9e0c323678d365c649e24c783eba957cc064c0
+EBUILD camaelon-2.0_pre20070504.ebuild 1127 RMD160 22ab95a28ffa24ae5ad9f47ab0c71b8c7493ce0d SHA1 5ea97b4c703144eccc50853a211b54ea7ae1374c SHA256 fe0e9f2763fa70e478222c3b45c2cf9b65378df155c3df8cc042938c4bba1d18
diff --git a/gnustep-libs/camaelon/camaelon-2.0_pre20070504.ebuild b/gnustep-libs/camaelon/camaelon-2.0_pre20070504.ebuild
index 737003f..eb04ef4 100644
--- a/gnustep-libs/camaelon/camaelon-2.0_pre20070504.ebuild
+++ b/gnustep-libs/camaelon/camaelon-2.0_pre20070504.ebuild
@@ -25,7 +25,8 @@ egnustep_install_domain "System"
 src_install() {
 	gnustep-2_src_install || die "install failed"
 
-	# install themes
-	mkdir -p "${D}$(egnustep_system_root)/Library/Themes"
-	cp -R ${WORKDIR}/*theme ${S}/*theme "${D}$(egnustep_system_root)/Library/Themes/"
+	#install themes (and link default one)
+	mkdir -p ${D}${GNUSTEP_SYSTEM_LIBRARY}/Themes
+	cp -R ${WORKDIR}/*theme ${D}${GNUSTEP_SYSTEM_LIBRARY}/Themes/
+	ln -s ${GNUSTEP_SYSTEM_LIBRARY}/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme ${D}${GNUSTEP_SYSTEM_LIBRARY}/Themes/
 }
diff --git a/gnustep-libs/camaelon/files/config-camaelon.sh b/gnustep-libs/camaelon/files/config-camaelon.sh
index 5520d1a..ca692aa 100644
--- a/gnustep-libs/camaelon/files/config-camaelon.sh
+++ b/gnustep-libs/camaelon/files/config-camaelon.sh
@@ -1,5 +1,5 @@
 echo "Applying Camaelon default theme..."
-echo "defaults write NSGlobalDomain GSAppKitUserBundles \"(${GNUSTEP_SYSTEM_ROOT}/Library/Bundles/Camaelon.themeEngine)\""
-defaults write NSGlobalDomain GSAppKitUserBundles "(${GNUSTEP_SYSTEM_ROOT}/Library/Bundles/Camaelon.themeEngine)"
+echo "defaults write NSGlobalDomain GSAppKitUserBundles \"(${GNUSTEP_SYSTEM_LIBRARY}/Bundles/Camaelon.themeEngine)\""
+defaults write NSGlobalDomain GSAppKitUserBundles "(${GNUSTEP_SYSTEM_LIBRARY}/Bundles/Camaelon.themeEngine)"
 echo "defaults write Camaelon Theme Nesedah"
 defaults write Camaelon Theme Nesedah
diff --git a/gnustep-libs/iconkit/Manifest b/gnustep-libs/iconkit/Manifest
new file mode 100644
index 0000000..235d111
--- /dev/null
+++ b/gnustep-libs/iconkit/Manifest
@@ -0,0 +1,2 @@
+DIST iconkit-0.0.1_pre20070521.tar.bz2 121872 RMD160 78e719ecb81aa8faaa2f82fb2b21a8eabbcd57f6 SHA1 d87d00579e705e9cf553918fe130231dd7df7181 SHA256 70bf961f20365a85d5a3e74dbb03323a45f57fd444364002a59af84a5657c363
+EBUILD iconkit-0.0.1_pre20070521.ebuild 739 RMD160 57bc571d8457b0bd1b54aabdb2e79ce7e48ca1e5 SHA1 fe7fcbe9e3bcb883ba8bfc867d4191aa51d1cffd SHA256 90ab3bbc4a35ba3ce09ea9a45ef44f8f87f0d8958058064ea2f656dbef00023a
diff --git a/gnustep-libs/iconkit/iconkit-0.0.1_pre20070521.ebuild b/gnustep-libs/iconkit/iconkit-0.0.1_pre20070521.ebuild
new file mode 100644
index 0000000..9480e87
--- /dev/null
+++ b/gnustep-libs/iconkit/iconkit-0.0.1_pre20070521.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.0.0.20050720.ebuild,v 1.2 2005/08/25 19:03:49 swegener Exp $
+
+inherit gnustep-2
+
+S=${WORKDIR}/IconKit
+
+DESCRIPTION="framework used to create icons using different elements"
+HOMEPAGE="http://www.etoile-project.org/etoile/mediawiki/index.php?title=IconKit"
+SRC_URI="http://overlays.gentoo.org/svn/proj/gnustep/downloads/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE=""
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed  -i "s/^include.*etoile.make//" GNUmakefile
+}
+
diff --git a/gnustep-libs/netclasses/Manifest b/gnustep-libs/netclasses/Manifest
new file mode 100644
index 0000000..5a9665d
--- /dev/null
+++ b/gnustep-libs/netclasses/Manifest
@@ -0,0 +1,2 @@
+DIST netclasses-1.06.tar.bz2 101987 RMD160 73d1a89841cacd2b357bf72c8002c5551fff6b47 SHA1 89e18f50ae14363973a5225a8c4f4ae628824b88 SHA256 6ef5879cd847da85e7a4dad9bfb74b08d41df60dc7fcbf01d689faad1aaced26
+EBUILD netclasses-1.06.ebuild 549 RMD160 771137a01954a840d55d21132bcc116a80d04dce SHA1 4909cd664ddcc98a03457543535b6f8d21726806 SHA256 eb74ca30804b7254f8b6756183cffb2e3b4b3fe59dfd9dbca30b02e62275c070
diff --git a/gnustep-libs/netclasses/netclasses-1.06.ebuild b/gnustep-libs/netclasses/netclasses-1.06.ebuild
new file mode 100644
index 0000000..c0f4435
--- /dev/null
+++ b/gnustep-libs/netclasses/netclasses-1.06.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/netclasses/netclasses-1.06.ebuild,v 1.1 2006/06/25 14:11:45 grobian Exp $
+
+inherit gnustep-2
+
+DESCRIPTION="An asynchronous networking library for GNUstep"
+HOMEPAGE="http://netclasses.aeruder.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE=""
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
diff --git a/gnustep-libs/popplerkit/Manifest b/gnustep-libs/popplerkit/Manifest
new file mode 100644
index 0000000..a35e656
--- /dev/null
+++ b/gnustep-libs/popplerkit/Manifest
@@ -0,0 +1,2 @@
+DIST popplerkit-0.0.1_pre20070520.tar.bz2 1736111 RMD160 ee139d697c32fcf980e63e357ff1c7fa88b8a284 SHA1 961937419a2bdaa038fbb6f27b4f222827f510f0 SHA256 de5f404741a78c60e712f6a453c08a45e575341eb2a946353f036334cb8d86c0
+EBUILD popplerkit-0.0.1_pre20070520.ebuild 825 RMD160 51e7ef410fc485bb5877855e6ce41c777585021e SHA1 b8a9ee5ba766ccb3d1b24d43aa0976586a1f573a SHA256 c3a9b83376f8217ebd5b830e1956b72ff0a272d8d163f1748bb15b49f567c08a
diff --git a/gnustep-libs/popplerkit/popplerkit-0.0.1_pre20070520.ebuild b/gnustep-libs/popplerkit/popplerkit-0.0.1_pre20070520.ebuild
new file mode 100644
index 0000000..1115531
--- /dev/null
+++ b/gnustep-libs/popplerkit/popplerkit-0.0.1_pre20070520.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.0.0.20050720.ebuild,v 1.2 2005/08/25 19:03:49 swegener Exp $
+
+inherit gnustep-2
+
+S=${WORKDIR}/PopplerKit
+
+DESCRIPTION="PopplerKit is a GNUstep/Cocoa framework for accessing and rendering PDF content."
+HOMEPAGE="http://www.etoile-project.org/etoile/mediawiki/index.php?title=Frameworks_Suite"
+SRC_URI="http://overlays.gentoo.org/svn/proj/gnustep/downloads/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE=""
+DEPEND="${GS_DEPEND}
+	>=app-text/poppler-0.4
+	>=media-libs/freetype-2"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed  -i "s/^include.*etoile.make//" GNUmakefile
+}
+
diff --git a/gnustep-libs/renaissance/Manifest b/gnustep-libs/renaissance/Manifest
new file mode 100644
index 0000000..d30e75c
--- /dev/null
+++ b/gnustep-libs/renaissance/Manifest
@@ -0,0 +1,2 @@
+DIST renaissance-0.8.1_pre20070522.tar.bz2 259358 RMD160 95e3fddfc31ce2a8044830fb6ac9143e6e5dc6f7 SHA1 4c216821f40d55f951d1623795a2ece31614ee58 SHA256 9eda944892c6da890c16124d511ddfd5a6a4d1fe3cc41c0ec453510262f98ebf
+EBUILD renaissance-0.8.1_pre20070522.ebuild 619 RMD160 970d7554f64007f1018fe6056d354a9e1292c5f1 SHA1 b205ef003820ff72adbb1f36ccebf8f9b8405cc4 SHA256 ab95ab33c67d2e630735dbb243622d566c860addceed3a805289a2ac11817742
diff --git a/gnustep-libs/renaissance/renaissance-0.8.1_pre20070522.ebuild b/gnustep-libs/renaissance/renaissance-0.8.1_pre20070522.ebuild
new file mode 100644
index 0000000..5ba079a
--- /dev/null
+++ b/gnustep-libs/renaissance/renaissance-0.8.1_pre20070522.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-libs/renaissance/renaissance-0.8.1_pre20060324.ebuild,v 1.2 2006/06/04 17:53:24 grobian Exp $
+
+inherit gnustep-2
+
+
+DESCRIPTION="GNUstep Renaissance allows to describe user interfaces XML files"
+HOMEPAGE="http://www.gnustep.it/Renaissance/index.html"
+SRC_URI="http://overlays.gentoo.org/svn/proj/gnustep/downloads/${P}.tar.bz2"
+
+
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "System"
diff --git a/profiles/package.unmask b/profiles/package.unmask
new file mode 100644
index 0000000..a0fab0e
--- /dev/null
+++ b/profiles/package.unmask
@@ -0,0 +1,4 @@
+# New working version of popplerkit from Etoile project
+# And unmasking vindaloo
+gnustep-apps/vindaloo
+>gnustep-libs/popplerkit-0.0.0
diff --git a/virtual/gnustep-back/Manifest b/virtual/gnustep-back/Manifest
new file mode 100644
index 0000000..5a4823e
--- /dev/null
+++ b/virtual/gnustep-back/Manifest
@@ -0,0 +1 @@
+EBUILD gnustep-back-0.12.0.ebuild 549 RMD160 6754d4ad5547ed969aa6310d8afc371c15bc2876 SHA1 716b390ba3e8f50df857a999f40505ecf2bc370c SHA256 3fb2835d88bdd9dc50fd628e8bb9ee8eed45fcfd8b9fbd8f2baf42b043050111
diff --git a/virtual/gnustep-back/gnustep-back-0.12.0.ebuild b/virtual/gnustep-back/gnustep-back-0.12.0.ebuild
new file mode 100644
index 0000000..6ac34a1
--- /dev/null
+++ b/virtual/gnustep-back/gnustep-back-0.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/mpi/mpi-1.0.ebuild,v 1.1 2006/10/17 04:09:53 dberkholz Exp $
+
+DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI=""
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+RDEPEND="|| (
+		~gnustep-base/gnustep-back-art-${PV}
+		~gnustep-base/gnustep-back-xlib-${PV}
+		~gnustep-base/gnustep-back-cairo-${PV}
+	)"
+DEPEND=""