Etoile 0.4.1 bump, part 3 (needs testing and bumps in portage)

svn path=/overlay/; revision=404

47 files changed, 55 insertions, 480 deletions

diff --git a/gnustep-apps/azalea/Manifest b/gnustep-apps/azalea/Manifest
deleted file mode 100644
index a94c11d..0000000
--- a/gnustep-apps/azalea/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD azalea-0.2.ebuild 546 RMD160 8a765e44fe7816dd51f7040eeb3adc445f8eee71 SHA1 071aebc50fc4fb1bba175d7131073a78d8e23b3f SHA256 8ebf2a2ecee99a634259beab1c6a11d4ad0805719abaf5fbd0c1304ca187c4cc
diff --git a/gnustep-apps/azalea/azalea-0.2.ebuild b/gnustep-apps/azalea/azalea-0.2.ebuild
deleted file mode 100644
index c1aa0b1..0000000
--- a/gnustep-apps/azalea/azalea-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/Azalea"
-
-DESCRIPTION="A window manager for GNUstep based on OpenBox 3"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/xwindowserverkit
-	x11-libs/libXcursor
-	x11-libs/startup-notification
-	x11-misc/xscreensaver"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/azbackground/Manifest b/gnustep-apps/azbackground/Manifest
index b6c33cb..c2092b6 100644
--- a/gnustep-apps/azbackground/Manifest
+++ b/gnustep-apps/azbackground/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD azbackground-0.2.ebuild 476 RMD160 cf103429cc39cf5f81bdf89f74a31fc7c32ce108 SHA1 4694428cd90b1c15fa6294d7dcdcded477cfb8c5 SHA256 e5631418ee4661feb6311ffc06a2372c87a9fce75a50da9e675c308e2b0fe6cd
-EBUILD azbackground-0.4.0.ebuild 484 RMD160 b39d31d41827fb7d8a66fd4a6ec894cd0ef8e613 SHA1 9761c81dac81b7645c9a0d7e2391a8d1dfeb1c39 SHA256 1a05ff1dc8d6eb54dc78e0ba99cd80cff40ac4a8351c849d8929877038f7ba0d
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD azbackground-0.4.1.ebuild 493 RMD160 ac12092b4e0aea8683a661a35281d86e4bf24042 SHA1 7bf54823095e2f6af065756f44f346678eaa5407 SHA256 f958f992d59e7bf9bc4e77eae1c5eba9515d4715898f22470ed45a603e773951
diff --git a/gnustep-apps/azbackground/azbackground-0.2.ebuild b/gnustep-apps/azbackground/azbackground-0.2.ebuild
deleted file mode 100644
index 5116949..0000000
--- a/gnustep-apps/azbackground/azbackground-0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/AZBackground"
-
-DESCRIPTION="A background image setter for the Etoile project"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/xwindowserverkit"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/azbackground/azbackground-0.4.0.ebuild b/gnustep-apps/azbackground/azbackground-0.4.1.ebuild
index 513349d..1c3598e 100644
--- a/gnustep-apps/azbackground/azbackground-0.4.0.ebuild
+++ b/gnustep-apps/azbackground/azbackground-0.4.1.ebuild
@@ -8,12 +8,12 @@ S="${WORKDIR}/Etoile-${PV}/Services/Private/AZBackground"
 
 DESCRIPTION="A background image setter for the Etoile project"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="gnustep-libs/xwindowserverkit"
+DEPEND=">=gnustep-libs/xwindowserverkit-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/azdock/Manifest b/gnustep-apps/azdock/Manifest
deleted file mode 100644
index 84cf05b..0000000
--- a/gnustep-apps/azdock/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD azdock-0.2.ebuild 635 RMD160 02f2c2d5292313f7ee7a04614f720405bbb91bcf SHA1 0549c694019f03915a3e26530447f344361f14be SHA256 934eabf77cfa7bd984f5b5b90b2173b54326f58f11ca35f868c57da0f2f9a274
diff --git a/gnustep-apps/azdock/azdock-0.2.ebuild b/gnustep-apps/azdock/azdock-0.2.ebuild
deleted file mode 100644
index 46fe09e..0000000
--- a/gnustep-apps/azdock/azdock-0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/AZDock"
-
-DESCRIPTION="A dock for the Etoile project"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/bookmarkkit
-	gnustep-libs/iconkit
-	gnustep-libs/xwindowserverkit
-	gnustep-apps/etoile-system"
-RDEPEND="${DEPEND}
-	gnustep-apps/azalea"
-
-src_compile() {
-	egnustep_env
-	egnustep_make etoile=yes || die "compilation failed"
-}
diff --git a/gnustep-apps/azswitch/Manifest b/gnustep-apps/azswitch/Manifest
deleted file mode 100644
index 1ab19a7..0000000
--- a/gnustep-apps/azswitch/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD azswitch-0.2.ebuild 501 RMD160 5d11342cb0d91d9443183a6fc37275e1014b7199 SHA1 67c7b989f0e13b6eeea725f8df5a0ba4b6aa2400 SHA256 88402d6d321de5b95352e23cd324e01f4c14cd2ecfb07cb00f19a0c4bdba73b0
diff --git a/gnustep-apps/azswitch/azswitch-0.2.ebuild b/gnustep-apps/azswitch/azswitch-0.2.ebuild
deleted file mode 100644
index b776269..0000000
--- a/gnustep-apps/azswitch/azswitch-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/AZSwitch"
-
-DESCRIPTION="A window switching application for the Etoile project"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/xwindowserverkit
-	gnustep-libs/etoile-ui"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/calc/Manifest b/gnustep-apps/calc/Manifest
deleted file mode 100644
index 3f4162d..0000000
--- a/gnustep-apps/calc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD calc-0.2.ebuild 693 RMD160 729c5aa2664cc1ea63d4d64fa94a02834bff3620 SHA1 1640a4718662a45bbd2085b2762bb24343d6e951 SHA256 6609a0dc08933816d5f3fb9654437b19538002c219289204916b2c83d13563ff
diff --git a/gnustep-apps/calc/calc-0.2.ebuild b/gnustep-apps/calc/calc-0.2.ebuild
deleted file mode 100644
index 06a2085..0000000
--- a/gnustep-apps/calc/calc-0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/Calc"
-
-DESCRIPTION="A very simple calculator"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/etoile-io"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-src_install() {
-	egnustep_env
-	dodir ${GNUSTEP_SYSTEM_APPS}
-	cp -R Calc.app ${D}/${GNUSTEP_SYSTEM_APPS}
-
-	# Tools wrapper
-	make_wrapper Calc ${GNUSTEP_SYSTEM_APPS}/Calc.app/Calc "" "" ${GNUSTEP_SYSTEM_TOOLS}
-}
diff --git a/gnustep-apps/dictionaryreader/Manifest b/gnustep-apps/dictionaryreader/Manifest
index 1371103..a28f9a2 100644
--- a/gnustep-apps/dictionaryreader/Manifest
+++ b/gnustep-apps/dictionaryreader/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD dictionaryreader-0.2.ebuild 557 RMD160 02c4c8c4b8708dca4b2292fc2eac23ae87112d68 SHA1 651740545fe685f97819b93047596dafd9301e6a SHA256 b54e0ba02cb0266af90bef64fa22d0c48f1e736cf45ce1ac113e1e02f343afb8
-EBUILD dictionaryreader-0.4.0.ebuild 565 RMD160 54aff98b9448e4a8f9dc3bd275f40de3e7e4e1c5 SHA1 3edb20f1f7449ddb670eead30db7270eb7486144 SHA256 237b83197599ee315cb585f517826c76bef0930190005d62a52f350d5ec59af9
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD dictionaryreader-0.4.1.ebuild 574 RMD160 e85bf57a6f29bb706b12401566a882f3e949ec36 SHA1 04caebbbb2f68d6a72e14f3eb0d6ccd89a18afcf SHA256 14d74fe9d5f5a3dbbe6867e6a9f4153f0d7c16760ea9020d08c5600f429f4c14
diff --git a/gnustep-apps/dictionaryreader/dictionaryreader-0.2.ebuild b/gnustep-apps/dictionaryreader/dictionaryreader-0.2.ebuild
deleted file mode 100644
index 2cf0bea..0000000
--- a/gnustep-apps/dictionaryreader/dictionaryreader-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/DictionaryReader"
-
-DESCRIPTION="Dictionary application that queries Dict servers"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/etoile-ui"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	egnustep_env
-	egnustep_make etoile=yes || die "compilation failed"
-}
diff --git a/gnustep-apps/dictionaryreader/dictionaryreader-0.4.0.ebuild b/gnustep-apps/dictionaryreader/dictionaryreader-0.4.1.ebuild
index a6b4488..14be154 100644
--- a/gnustep-apps/dictionaryreader/dictionaryreader-0.4.0.ebuild
+++ b/gnustep-apps/dictionaryreader/dictionaryreader-0.4.1.ebuild
@@ -8,14 +8,14 @@ S="${WORKDIR}/Etoile-${PV}/Services/User/DictionaryReader"
 
 DESCRIPTION="Dictionary application that queries Dict servers"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="gnustep-libs/etoile-ui"
+DEPEND=">=gnustep-libs/etoile-ui-${PV}"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/gnustep-apps/etoile-corner/Manifest b/gnustep-apps/etoile-corner/Manifest
index d41af16..21f5aee 100644
--- a/gnustep-apps/etoile-corner/Manifest
+++ b/gnustep-apps/etoile-corner/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD etoile-corner-0.2.ebuild 487 RMD160 a1d72653b477377a5a84275c6c82227d0e12401f SHA1 d9963df8cebccc7214a11f600e94edc3f74714fe SHA256 674e056fcc08acd9d3b9c2e9a215a7f918792bedc18ba9c02d18fa3ca40d7362
-EBUILD etoile-corner-0.4.0.ebuild 522 RMD160 a6a8e04b3063c0fddb4655d0779e87e57ae3270a SHA1 beaaa348248fc7b789aa9d745a330d41d7354c38 SHA256 6f3bf365160776e438f399a146f9b71377ed88cc2f8c8059d59ef22c80c567c6
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD etoile-corner-0.4.1.ebuild 539 RMD160 b0527dd7d7c99800c1c432aca86343bb95495188 SHA1 1711dd47d05377be5f55d6c672c53711c99194df SHA256 f4feb0b03689c3b4d3551ccb2e18d66bda4fb46057426b458a63c342159a5bc7
diff --git a/gnustep-apps/etoile-corner/etoile-corner-0.2.ebuild b/gnustep-apps/etoile-corner/etoile-corner-0.2.ebuild
deleted file mode 100644
index b9926e2..0000000
--- a/gnustep-apps/etoile-corner/etoile-corner-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/Corner"
-
-DESCRIPTION="Runs a StepTalk script when the mouse moves into the corner of the
-screen"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/steptalk"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/etoile-corner/etoile-corner-0.4.0.ebuild b/gnustep-apps/etoile-corner/etoile-corner-0.4.1.ebuild
index e878e20..8e023c6 100644
--- a/gnustep-apps/etoile-corner/etoile-corner-0.4.0.ebuild
+++ b/gnustep-apps/etoile-corner/etoile-corner-0.4.1.ebuild
@@ -8,7 +8,7 @@ S="${WORKDIR}/Etoile-${PV}/Services/Private/Corner"
 
 DESCRIPTION="A simple 'hot-corners' implementation"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -16,6 +16,6 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	gnustep-libs/scriptkit
-	gnustep-libs/smalltalkkit"
+	>=gnustep-libs/scriptkit-${PV}
+	>=gnustep-libs/smalltalkkit-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/etoile-idle/Manifest b/gnustep-apps/etoile-idle/Manifest
index fc62cd1..a2173a6 100644
--- a/gnustep-apps/etoile-idle/Manifest
+++ b/gnustep-apps/etoile-idle/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD etoile-idle-0.2.ebuild 477 RMD160 13dafff212007a081a06caed581045bc5ccad624 SHA1 5550f8c1e4259ebb5f7b22fad6b29fa3c6ec414b SHA256 cd31a50e38fa1b1d2613b39751cd9c2e62f84ac0e3bcaa311be643fa9f06f7db
-EBUILD etoile-idle-0.4.0.ebuild 485 RMD160 4446daed2e3c1ab6c437ee2a981fa91b50f9e28f SHA1 4dd4b9e7eeae85ecaabbe76ab8fcaa6138fc2dac SHA256 05d9af8604a4942e50248deb8dea82477d7ea8329baa14eafb667005a78609bc
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD etoile-idle-0.4.1.ebuild 486 RMD160 2b652c7feb7ee9889b19e3feb895e90db3943023 SHA1 dbf4f946e28844ad204cad6af3dc9cfb32de40de SHA256 4d4cc78f19ba82852ededfac8553d9b6e3d648332f555f5bad24f49edbf71d46
diff --git a/gnustep-apps/etoile-idle/etoile-idle-0.2.ebuild b/gnustep-apps/etoile-idle/etoile-idle-0.2.ebuild
deleted file mode 100644
index 3b8c9cc..0000000
--- a/gnustep-apps/etoile-idle/etoile-idle-0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/Idle"
-
-DESCRIPTION="sends user-idle notifications every minute that the user is idle"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="x11-libs/libXScrnSaver"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/etoile-idle/etoile-idle-0.4.0.ebuild b/gnustep-apps/etoile-idle/etoile-idle-0.4.1.ebuild
index 25f8ce1..9156b09 100644
--- a/gnustep-apps/etoile-idle/etoile-idle-0.4.0.ebuild
+++ b/gnustep-apps/etoile-idle/etoile-idle-0.4.1.ebuild
@@ -8,7 +8,7 @@ S="${WORKDIR}/Etoile-${PV}/Services/Private/Idle"
 
 DESCRIPTION="sends user-idle notifications every minute that the user is idle"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/gnustep-apps/etoile-menuserver/Manifest b/gnustep-apps/etoile-menuserver/Manifest
index fa52a06..8167815 100644
--- a/gnustep-apps/etoile-menuserver/Manifest
+++ b/gnustep-apps/etoile-menuserver/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD etoile-menuserver-0.2.ebuild 556 RMD160 d2a83c268836a2a37f4671d37614faf01a596991 SHA1 d6b9c50b6dd8171e4d281102a5b2c9772f85a483 SHA256 0a2f9ebf88be7ad242e43f3a3207765546e33b304c96d64c31f439b5f6844a9f
-EBUILD etoile-menuserver-0.4.0.ebuild 754 RMD160 181b606f2b068338af05ff82f7fc108570158d9b SHA1 394da95f40e9b1f616314aca573383c1cc3031bc SHA256 aa5e661a35e95fc722186332434b9cd8731caed1489f4529c9b68690b4bb19bd
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD etoile-menuserver-0.4.1.ebuild 766 RMD160 aa84eb88415c5c8396943dfa2758187b353541d1 SHA1 8736b5abfda01451ac9f5746938f328cf19b50e6 SHA256 1e8cb7bcf76b4b196cffe2779690bf577c588d8d1c4da127935994203de31051
diff --git a/gnustep-apps/etoile-menuserver/etoile-menuserver-0.2.ebuild b/gnustep-apps/etoile-menuserver/etoile-menuserver-0.2.ebuild
deleted file mode 100644
index e074e33..0000000
--- a/gnustep-apps/etoile-menuserver/etoile-menuserver-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/MenuServer"
-
-DESCRIPTION="Menubar for the Etoile environment"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-apps/etoile-system
-	gnustep-libs/xwindowserverkit"
-RDEPEND="${DEPEND}
-	gnustep-libs/service-menulet
-	gnustep-libs/volumecontrol-menulet"
diff --git a/gnustep-apps/etoile-menuserver/etoile-menuserver-0.4.0.ebuild b/gnustep-apps/etoile-menuserver/etoile-menuserver-0.4.1.ebuild
index cb87458..c1fa7c1 100644
--- a/gnustep-apps/etoile-menuserver/etoile-menuserver-0.4.0.ebuild
+++ b/gnustep-apps/etoile-menuserver/etoile-menuserver-0.4.1.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit gnustep-2
 
 S="${WORKDIR}/Etoile-${PV}/Services/Private/MenuServer"
 
 DESCRIPTION="Menubar for the Etoile environment"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -16,16 +18,14 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	gnustep-libs/systemconfig
-	gnustep-libs/xwindowserverkit"
+	>=gnustep-libs/systemconfig-${PV}
+	>=gnustep-libs/xwindowserverkit-${PV}"
 RDEPEND="${DEPEND}"
 # Not available in current stable
 #	gnustep-libs/service-menulet
 #	gnustep-libs/volumecontrol-menulet"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${WORKDIR}/Etoile-${PV}"
-
 	sed -i -e "s/-Werror//" etoile.make || die "sed failed"
 }
diff --git a/gnustep-apps/etoile-system/Manifest b/gnustep-apps/etoile-system/Manifest
deleted file mode 100644
index c703d76..0000000
--- a/gnustep-apps/etoile-system/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD etoile-system-0.2.ebuild 625 RMD160 5088fd3262035831e078a702bd507cf9b5af9e3f SHA1 ec1886ba36486c95dc9058878874239198f03b58 SHA256 0759cebafca17551618a8136393cd2280fd4fba23531a45440c651f0c76cd5f2
diff --git a/gnustep-apps/etoile-system/etoile-system-0.2.ebuild b/gnustep-apps/etoile-system/etoile-system-0.2.ebuild
deleted file mode 100644
index 5081bc0..0000000
--- a/gnustep-apps/etoile-system/etoile-system-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/System"
-
-DESCRIPTION="Etoile main system process"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-gnustep_config_script() {
-	echo "gnustep_set_default NSGlobalDomain NSUseRunningCopy YES"
-	echo "gnustep_set_default GWorkspace NoWarnOnQuit YES"
-	echo "gnustep_set_default NSGlobalDomain GSWorkspaceApplication \"NotExist.app\""
-}
diff --git a/gnustep-apps/etoile/Manifest b/gnustep-apps/etoile/Manifest
index bb78fa9..e658f32 100644
--- a/gnustep-apps/etoile/Manifest
+++ b/gnustep-apps/etoile/Manifest
@@ -1,3 +1 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD etoile-0.2.ebuild 1609 RMD160 f13eaa28823c227829a4fcf1ce55bec1bdb0cbb9 SHA1 efa8cd825e0dd71250d9e23340119a77adb6ee16 SHA256 cb85ec65d87f4b45de6ab0727557d964fcc80c8b63c77135c54850196a11a228
-EBUILD etoile-0.4.0.ebuild 707 RMD160 3b6b700d51b7f2cc7ab273156f9d7d16a3bfc2bc SHA1 c15c6adb7a9bec6b74e0972f6dcc7ffc1ffb6006 SHA256 89181f315ba4956b7e0eaddedbf0de952aee3e41788815358b69c224a9ee6de6
+EBUILD etoile-0.4.1.ebuild 707 RMD160 3b6b700d51b7f2cc7ab273156f9d7d16a3bfc2bc SHA1 c15c6adb7a9bec6b74e0972f6dcc7ffc1ffb6006 SHA256 89181f315ba4956b7e0eaddedbf0de952aee3e41788815358b69c224a9ee6de6
diff --git a/gnustep-apps/etoile/etoile-0.2.ebuild b/gnustep-apps/etoile/etoile-0.2.ebuild
deleted file mode 100644
index 0b9a5a6..0000000
--- a/gnustep-apps/etoile/etoile-0.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/Private/System"
-
-DESCRIPTION="Meta-package for the Etoile desktop environment"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-RDEPEND=">=gnustep-apps/addresses-0.4.7
-	>=gnustep-apps/azalea-${PV}
-	>=gnustep-apps/azbackground-${PV}
-	>=gnustep-apps/azdock-${PV}
-	>=gnustep-apps/azswitch-${PV}
-	>=gnustep-apps/calc-${PV}
-	>=gnustep-apps/dictionaryreader-${PV}
-	>=gnustep-apps/etoile-corner-${PV}
-	>=gnustep-apps/etoile-idle-${PV}
-	>=gnustep-apps/etoile-menuserver-${PV}
-	>=gnustep-apps/etoile-system-${PV}
-	>=gnustep-apps/fontmanager-${PV}
-	>=gnustep-apps/grr-${PV}
-	>=gnustep-apps/outerspace-${PV}
-	>=gnustep-apps/sketch-${PV}
-	>=gnustep-apps/stepchat-${PV}
-	>=gnustep-apps/typewriter-${PV}
-	>=gnustep-apps/vindaloo-${PV}
-	>=gnustep-libs/camaelon-${PV}
-	>=gnustep-libs/etoile-behavior-${PV}
-	>=gnustep-libs/etoile-wildmenus-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix path
-	egnustep_env
-	sed -i "s#/usr/local/bin/etoile#${GNUSTEP_SYSTEM_TOOLS}/etoile_system#" \
-		etoile.desktop || die "Fixing desktop file failed"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	egnustep_env
-
-	# Install SystemTaskList
-	dodir ${GNUSTEP_SYSTEM_LIBRARY}/Etoile
-	insinto ${GNUSTEP_SYSTEM_LIBRARY}/Etoile
-	doins SystemTaskList.plist
-
-	# Install desktop entry file
-	insinto /usr/share/xsessions
-	doins etoile.desktop
-}
diff --git a/gnustep-apps/etoile/etoile-0.4.0.ebuild b/gnustep-apps/etoile/etoile-0.4.1.ebuild
index dc0972d..dc0972d 100644
--- a/gnustep-apps/etoile/etoile-0.4.0.ebuild
+++ b/gnustep-apps/etoile/etoile-0.4.1.ebuild
diff --git a/gnustep-apps/fontmanager/Manifest b/gnustep-apps/fontmanager/Manifest
index e808209..102eae6 100644
--- a/gnustep-apps/fontmanager/Manifest
+++ b/gnustep-apps/fontmanager/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD fontmanager-0.2.ebuild 390 RMD160 37dde5bcf7fff087db0e340909d40ff2f1e06cfe SHA1 5a293b7954603e68c7068a7f8694ea5f47fbe247 SHA256 01ede0b75b358a7a517e527087d365ffa1c3e7dcb98110f68a8a64c4b919e2af
-EBUILD fontmanager-0.4.0.ebuild 398 RMD160 0747d9fd69f5b13961c9aa353de7454360ca0acb SHA1 f70af21174b50ae94bca97076d393dbd76dd9013 SHA256 b67229fff09fea56000568d80a9bf70970e118b3926bcfd10244a37b17a21679
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD fontmanager-0.4.1.ebuild 399 RMD160 13dcccd2b55f9ac39178144c81b3f8761e680d5e SHA1 42e6f72568525d49a2e186687a097e642b01d4ec SHA256 6b5a5b801cd917dbfae76e331e0b514ab9675e6ef56e079b531db822775ed2ff
diff --git a/gnustep-apps/fontmanager/fontmanager-0.2.ebuild b/gnustep-apps/fontmanager/fontmanager-0.2.ebuild
deleted file mode 100644
index 1f73e9f..0000000
--- a/gnustep-apps/fontmanager/fontmanager-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/FontManager"
-
-DESCRIPTION="Fonts managing application"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
diff --git a/gnustep-apps/fontmanager/fontmanager-0.4.0.ebuild b/gnustep-apps/fontmanager/fontmanager-0.4.1.ebuild
index 3bc4a89..bb921e8 100644
--- a/gnustep-apps/fontmanager/fontmanager-0.4.0.ebuild
+++ b/gnustep-apps/fontmanager/fontmanager-0.4.1.ebuild
@@ -8,7 +8,7 @@ S="${WORKDIR}/Etoile-${PV}/Services/User/FontManager"
 
 DESCRIPTION="Fonts managing application"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/gnustep-apps/grr/Manifest b/gnustep-apps/grr/Manifest
deleted file mode 100644
index 6d2a490..0000000
--- a/gnustep-apps/grr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD grr-0.2.ebuild 588 RMD160 800cb4ced2a6fba03c7d219223902ac1580db889 SHA1 a165e6fb0fc3e7c821855d529a15d7289e5f4377 SHA256 d9147379b8b0d6cb9359fec39eac072e331dc9ca26735b660edf65cc28e53db0
diff --git a/gnustep-apps/grr/grr-0.2.ebuild b/gnustep-apps/grr/grr-0.2.ebuild
deleted file mode 100644
index 9584db0..0000000
--- a/gnustep-apps/grr/grr-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/${PN/g/G}"
-
-DESCRIPTION="RSS Reader application for RSS/OPML feeds"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/etoile-ui
-	gnustep-libs/opmlkit
-	gnustep-libs/rsskit"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	egnustep_env
-	egnustep_make etoile=yes || die "compilation failed"
-}
diff --git a/gnustep-apps/melodie/Manifest b/gnustep-apps/melodie/Manifest
index 1de8af3..6dc234a 100644
--- a/gnustep-apps/melodie/Manifest
+++ b/gnustep-apps/melodie/Manifest
@@ -1,2 +1,2 @@
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD melodie-0.4.0.ebuild 820 RMD160 7235282394b54cb344f264d2e5428cff3c5864ed SHA1 3cc0eba514e7f5a022824d6fe5c1b8765022c550 SHA256 8c51b6f0c21cdceccec82b8190a5a11ac454a95551a1eeed7851ca8d1f3c6d85
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD melodie-0.4.1.ebuild 865 RMD160 6f1680f073132499e7f1cc42c250bf4f88a33136 SHA1 fbd4533a58280dee41522c9f633734953afdb858 SHA256 c8983a58c73ee285f41a70d8701fe632fbfd149a86cc591ca2c2610053263969
diff --git a/gnustep-apps/melodie/melodie-0.4.0.ebuild b/gnustep-apps/melodie/melodie-0.4.1.ebuild
index 8e41451..c16da91 100644
--- a/gnustep-apps/melodie/melodie-0.4.0.ebuild
+++ b/gnustep-apps/melodie/melodie-0.4.1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit gnustep-2
 
 S="${WORKDIR}/Etoile-${PV}/Services/User/Melodie"
@@ -9,7 +11,7 @@ S="${WORKDIR}/Etoile-${PV}/Services/User/Melodie"
 DESCRIPTION="Melodie is a music player for Etoile"
 
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -19,16 +21,15 @@ IUSE=""
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
 	media-libs/libmp4v2
 	media-libs/taglib
-	gnustep-libs/coreobject
-	gnustep-libs/etoile-ui
-	gnustep-libs/iconkit
-	gnustep-libs/mediakit
-	gnustep-libs/scriptkit
-	gnustep-libs/smalltalkkit"
+	>=gnustep-libs/coreobject-${PV}
+	>=gnustep-libs/etoile-ui-${PV}
+	>=gnustep-libs/iconkit-${PV}
+	>=gnustep-libs/mediakit-${PV}
+	>=gnustep-libs/scriptkit-${PV}
+	>=gnustep-libs/smalltalkkit-${PV}"
 RDEPEND="${DEPEND}"
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/Etoile-${PV}"
 
+src_prepare() {
+	cd "${WORKDIR}/Etoile-${PV}"
 	sed -i -e "s/-Werror/-Werror -Wno-unreachable-code/" etoile.make "${S}"/GNUmakefile || die "sed failed"
 }
diff --git a/gnustep-apps/outerspace/Manifest b/gnustep-apps/outerspace/Manifest
deleted file mode 100644
index b476ac1..0000000
--- a/gnustep-apps/outerspace/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD outerspace-0.2.ebuild 569 RMD160 9abe74e4622304e56345842b34ad127b2e4940dd SHA1 9655c54916a3e125cf9754ecb4a088c5a49ebe7e SHA256 e1df78447f2ca95fd681287ac0a8c70ab3c94bbc543461be6f2da87421fd3d26
diff --git a/gnustep-apps/outerspace/outerspace-0.2.ebuild b/gnustep-apps/outerspace/outerspace-0.2.ebuild
deleted file mode 100644
index aabd865..0000000
--- a/gnustep-apps/outerspace/outerspace-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/OuterSpace"
-
-DESCRIPTION="Spacial file manager for the Etoile project"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/distributedview
-	gnustep-libs/etoile-ui
-	gnustep-libs/iconkit
-	gnustep-libs/inspectorkit
-	gnustep-libs/xwindowserverkit"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/scriptservices/Manifest b/gnustep-apps/scriptservices/Manifest
index 384c0f7..6bc93fe 100644
--- a/gnustep-apps/scriptservices/Manifest
+++ b/gnustep-apps/scriptservices/Manifest
@@ -1,2 +1,2 @@
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD scriptservices-0.4.0.ebuild 490 RMD160 213d73f9d497dd94cdba04ed90f49601c1eff43c SHA1 90c0ce5b2e75d545a05d384384237b9cc7475ef5 SHA256 8a7efe6f8adf4311d2e04dc3552d6a1ae89d57519185ac5732de09f57084a4ac
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD scriptservices-0.4.1.ebuild 499 RMD160 cc4524cd0e81baac549b746745148532ea3560f3 SHA1 6eee7b5c3db5ac5d675ddb447d5c4bf46a347b8b SHA256 0eac18676da1a2f05a03619722d5a8f3315b840f3833d645dbeff1b90b557d50
diff --git a/gnustep-apps/scriptservices/scriptservices-0.4.0.ebuild b/gnustep-apps/scriptservices/scriptservices-0.4.1.ebuild
index ebfa1c4..b2e5ae8 100644
--- a/gnustep-apps/scriptservices/scriptservices-0.4.0.ebuild
+++ b/gnustep-apps/scriptservices/scriptservices-0.4.1.ebuild
@@ -8,12 +8,12 @@ S="${WORKDIR}/Etoile-${PV}/Services/Private/ScriptServices"
 
 DESCRIPTION="Gateway between GNUstep system services and Unix scripts"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="gnustep-libs/smalltalkkit"
+DEPEND=">=gnustep-libs/smalltalkkit-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/sketch/Manifest b/gnustep-apps/sketch/Manifest
deleted file mode 100644
index 092f250..0000000
--- a/gnustep-apps/sketch/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD sketch-0.2.ebuild 393 RMD160 310ae76700583cd0f10b06e3c17bc8a49357cf4e SHA1 a5b15e6977ae800bf9bee31b477ae7bcaa702552 SHA256 534e39ec565a87e0366e107ebe3d3edeb17b419ff04755d8671b43da5daea4e3
diff --git a/gnustep-apps/sketch/sketch-0.2.ebuild b/gnustep-apps/sketch/sketch-0.2.ebuild
deleted file mode 100644
index db1f092..0000000
--- a/gnustep-apps/sketch/sketch-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/Sketch"
-
-DESCRIPTION="A vector-based drawing application"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
diff --git a/gnustep-apps/stepchat/Manifest b/gnustep-apps/stepchat/Manifest
index 01347c4..80c88df 100644
--- a/gnustep-apps/stepchat/Manifest
+++ b/gnustep-apps/stepchat/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD stepchat-0.2.ebuild 387 RMD160 f254efd5854a31e4cf39c67a03aba059c91dccfa SHA1 71193b781b8461f0efb587e73c79c7941d994b2b SHA256 857daf74104e03082a02519a05bf5d412fd731acd2103a63b68179e7cbd8056b
-EBUILD stepchat-0.4.0.ebuild 520 RMD160 827c5d5007388b1b7938d0d83f737aefd96a1283 SHA1 6cdbe1e0728652e79cc3388ae320550ada7ee8d1 SHA256 74f59578cd5c84230d80bc63a9a091ccc502579b03e861c8249da01979c42e4b
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD stepchat-0.4.1.ebuild 537 RMD160 ffdbb7c34752472a62722134bf0a69069f8d8574 SHA1 91ffeb8733ecfc93c62ee83b59d70b16de7d0d62 SHA256 cd438d4d524da8edb31587202669b7306c247097e08b76ef3c049b37fd21cb07
diff --git a/gnustep-apps/stepchat/stepchat-0.2.ebuild b/gnustep-apps/stepchat/stepchat-0.2.ebuild
deleted file mode 100644
index 06de697..0000000
--- a/gnustep-apps/stepchat/stepchat-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/Jabber"
-
-DESCRIPTION="instant messenger for jabber"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
diff --git a/gnustep-apps/stepchat/stepchat-0.4.0.ebuild b/gnustep-apps/stepchat/stepchat-0.4.1.ebuild
index 547cb9f..bffe92e 100644
--- a/gnustep-apps/stepchat/stepchat-0.4.0.ebuild
+++ b/gnustep-apps/stepchat/stepchat-0.4.1.ebuild
@@ -8,7 +8,7 @@ S="${WORKDIR}/Etoile-${PV}/Services/User/Jabber"
 
 DESCRIPTION="Etoilé instant messenger for jabber"
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -16,6 +16,6 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	gnustep-libs/etoile-serialize
-	gnustep-libs/xmppkit"
+	>=gnustep-libs/etoile-serialize-${PV}
+	>=gnustep-libs/xmppkit-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/typewriter/Manifest b/gnustep-apps/typewriter/Manifest
index a40354f..714eaf8 100644
--- a/gnustep-apps/typewriter/Manifest
+++ b/gnustep-apps/typewriter/Manifest
@@ -1,4 +1,2 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD typewriter-0.2.ebuild 450 RMD160 205b4aef03a7d21da7bb3c8c72990ba91445734b SHA1 efbaf0836d996ed79a1f3cc1c0d945296b6f299f SHA256 c592a1f9fbbb9ff88c3b8ca474bbeb4c2525f3b249eba39fc56fe212ffa36a98
-EBUILD typewriter-0.4.0.ebuild 504 RMD160 b887aa10b2778fd2b1d1a0c9870dc16a820624fe SHA1 2cd8033a26123750082d23ecca982ba7bf2f8bff SHA256 e514a991a8b3b89d1121637d13b06e0b4fc305bcee1c0b04d008dff2b4eb1fc9
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD typewriter-0.4.1.ebuild 521 RMD160 5059fcad369a2bf47e07b27e05cc671b8612a637 SHA1 120b5cdcf5fd6510358d40481ad29f6c8203799c SHA256 bcd081d7be2e2b375d872e9a395df7e10d2996555fa451124d0d45a5fbe26435
diff --git a/gnustep-apps/typewriter/typewriter-0.2.ebuild b/gnustep-apps/typewriter/typewriter-0.2.ebuild
deleted file mode 100644
index 1e076dd..0000000
--- a/gnustep-apps/typewriter/typewriter-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnustep-2
-
-S="${WORKDIR}/Etoile-${PV}/Services/User/${PN/t/T}"
-
-DESCRIPTION="Etoile project simple word processor"
-
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-DEPEND="gnustep-libs/ogrekit"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/typewriter/typewriter-0.4.0.ebuild b/gnustep-apps/typewriter/typewriter-0.4.1.ebuild
index 5c5f343..d0971b5 100644
--- a/gnustep-apps/typewriter/typewriter-0.4.0.ebuild
+++ b/gnustep-apps/typewriter/typewriter-0.4.1.ebuild
@@ -9,13 +9,13 @@ S="${WORKDIR}/Etoile-${PV}/Services/User/${PN/t/T}"
 DESCRIPTION="Etoilé general text editor for plain and rich format text"
 
 HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
+SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.bz2"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="gnustep-libs/ogrekit
-	gnustep-libs/scriptkit"
+DEPEND=">=gnustep-libs/ogrekit-${PV}
+	>=gnustep-libs/scriptkit-${PV}"
 RDEPEND="${DEPEND}"