[WIP] Starting bump to Etoile 0.4.1, removing 0.2 and 0.4.0

svn path=/overlay/; revision=402

35 files changed, 34 insertions, 277 deletions

diff --git a/gnustep-libs/addresseskit/Manifest b/gnustep-libs/addresseskit/Manifest
index b512848..8a23649 100644
--- a/gnustep-libs/addresseskit/Manifest
+++ b/gnustep-libs/addresseskit/Manifest
@@ -1,3 +1,2 @@
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD addresseskit-0.4.0.ebuild 466 RMD160 760679c5a9ca61d9c7837cd2873c1ce6642ff30b SHA1 9dfbfad94f26b1f6fd138875ab6d142866e5c9ed SHA256 4a5ba95f91b1f8dcc6715a21dc251a6f8540dcccefb61a2dc2c1eba427a67849
-MISC .addresseskit-0.4.0.ebuild.swp 12288 RMD160 13efe66aff4d38400c64b5e5287f6fdef03b99ec SHA1 0e0e199b87ae29cddd1236524e25aa98d4cdf20d SHA256 107a6a14fba42c7dabccf02f520b3ec569eb4c03558b6ccb7ed9d24d507665fc
+DIST etoile-0.4.1.tar.gz 8966178 RMD160 aaaed1d8bb3d3c946de5c23ad1171a78526469ba SHA1 9ffa757bf42342fd6a2e7fa542b4521eee9c99d0 SHA256 91c9dc41f098d5681832ba8ce52690be8b2c45d85414d2c8388c3116c9e443d4
+EBUILD addresseskit-0.4.1.ebuild 466 RMD160 760679c5a9ca61d9c7837cd2873c1ce6642ff30b SHA1 9dfbfad94f26b1f6fd138875ab6d142866e5c9ed SHA256 4a5ba95f91b1f8dcc6715a21dc251a6f8540dcccefb61a2dc2c1eba427a67849
diff --git a/gnustep-libs/addresseskit/addresseskit-0.4.0.ebuild b/gnustep-libs/addresseskit/addresseskit-0.4.1.ebuild
index 1c58679..1c58679 100644
--- a/gnustep-libs/addresseskit/addresseskit-0.4.0.ebuild
+++ b/gnustep-libs/addresseskit/addresseskit-0.4.1.ebuild
diff --git a/gnustep-libs/bookmarkkit/Manifest b/gnustep-libs/bookmarkkit/Manifest
deleted file mode 100644
index 7160a77..0000000
--- a/gnustep-libs/bookmarkkit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD bookmarkkit-0.2.ebuild 461 RMD160 48b7c07edf56cc2c943a583dd91c647ba852738e SHA1 66ae6746bfa758946c78a283ceb3b7999582e7af SHA256 2ca7ddad286442e6e80b92ef2b9289a56041efd1c065dcd4d515403c8596df74
diff --git a/gnustep-libs/bookmarkkit/bookmarkkit-0.2.ebuild b/gnustep-libs/bookmarkkit/bookmarkkit-0.2.ebuild
deleted file mode 100644
index 42e1c8a..0000000
--- a/gnustep-libs/bookmarkkit/bookmarkkit-0.2.ebuild
+++ /dev/null
@@ -1,17 +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}/Frameworks/BookmarkKit"
-
-DESCRIPTION="System wide bookmarks support framework"
-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"
-
-DEPEND="gnustep-libs/collectionkit"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-libs/collectionkit/Manifest b/gnustep-libs/collectionkit/Manifest
deleted file mode 100644
index 7ef38b7..0000000
--- a/gnustep-libs/collectionkit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD collectionkit-0.2.ebuild 409 RMD160 7baae0c582ab50854803b3a8e7510fe3786ef0d9 SHA1 b8477f5c350a54228fb0f84c132a2bd9fbc97ec7 SHA256 f26504025a0ffc1d13155a28853454b95899ffa43dad316e3d8d2bc0b5ed61b5
diff --git a/gnustep-libs/collectionkit/collectionkit-0.2.ebuild b/gnustep-libs/collectionkit/collectionkit-0.2.ebuild
deleted file mode 100644
index ce9e2f0..0000000
--- a/gnustep-libs/collectionkit/collectionkit-0.2.ebuild
+++ /dev/null
@@ -1,14 +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}/Frameworks/CollectionKit"
-
-DESCRIPTION="Generic collection-based support framework"
-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"
diff --git a/gnustep-libs/coreobject/Manifest b/gnustep-libs/coreobject/Manifest
index 893b65c..466cad4 100644
--- a/gnustep-libs/coreobject/Manifest
+++ b/gnustep-libs/coreobject/Manifest
@@ -1,2 +1,2 @@
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD coreobject-0.4.0.ebuild 543 RMD160 adb78be0134a4e7175841912b88b084240af8543 SHA1 48ca2bfba329d6d709f1c0b658f4ce456c0a3f1c SHA256 a6c91620fce7deaf64ecd7973ae0b756ed360af28c0760bedf074eb88c912bfe
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD coreobject-0.4.1.ebuild 552 RMD160 b4c46c2189221ba46ed181025809a7521650321b SHA1 11372ec95088fe7dbb379ac27d25176f61b524d4 SHA256 bf72295f0693b93b4d6a6ff8ac481587e760340098f349d1bdd88ca01641a950
diff --git a/gnustep-libs/coreobject/coreobject-0.4.0.ebuild b/gnustep-libs/coreobject/coreobject-0.4.1.ebuild
index 81b0e51..4c372b7 100644
--- a/gnustep-libs/coreobject/coreobject-0.4.0.ebuild
+++ b/gnustep-libs/coreobject/coreobject-0.4.1.ebuild
@@ -8,7 +8,7 @@ S="${WORKDIR}/Etoile-${PV}/Frameworks/CoreObject"
 
 DESCRIPTION="A framework for describing and organizing model objects"
 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"
 SLOT="0"
@@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
-	gnustep-libs/etoile-serialize
+	>=gnustep-libs/etoile-serialize-${PV}
 	virtual/postgresql-base"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-libs/distributedview/Manifest b/gnustep-libs/distributedview/Manifest
deleted file mode 100644
index 566a1e7..0000000
--- a/gnustep-libs/distributedview/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD distributedview-0.2.ebuild 485 RMD160 d9c1316b36c1ab08a746919be81387a0afbf0530 SHA1 e3b50421ee23ccb2aa0c28126443bc373678b90f SHA256 30d4f331b478a96406db348117792d4a5168c31b9684a34a8d1bac86ad532ba8
diff --git a/gnustep-libs/distributedview/distributedview-0.2.ebuild b/gnustep-libs/distributedview/distributedview-0.2.ebuild
deleted file mode 100644
index 5f9ac32..0000000
--- a/gnustep-libs/distributedview/distributedview-0.2.ebuild
+++ /dev/null
@@ -1,17 +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}/Frameworks/DistributedView"
-
-DESCRIPTION="Etoile project extensions framework, provides a flexible icon view"
-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"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-libs/etoile-behavior/Manifest b/gnustep-libs/etoile-behavior/Manifest
deleted file mode 100644
index 1ba14b0..0000000
--- a/gnustep-libs/etoile-behavior/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD etoile-behavior-0.2.ebuild 555 RMD160 320caf0693d3fafe6d13c72f7e285210fee96c3b SHA1 c0af26006cc31dab41df5dbf9b76208973d34677 SHA256 6395158016855c297b39583e0a22c0fc0d2d002e955700f848659379083cdd9c
diff --git a/gnustep-libs/etoile-behavior/etoile-behavior-0.2.ebuild b/gnustep-libs/etoile-behavior/etoile-behavior-0.2.ebuild
deleted file mode 100644
index fe89dee..0000000
--- a/gnustep-libs/etoile-behavior/etoile-behavior-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}/Bundles/EtoileBehavior"
-
-DESCRIPTION="handles behind-the-scene tasks in Etoile"
-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"
-
-gnustep_config_script() {
-	echo "gnustep_append_default NSGlobalDomain GSAppKitUserBundles \"${GNUSTEP_SYSTEM_LIBRARY}/Bundles/EtoileBehavior.bundle\""
-}
diff --git a/gnustep-libs/etoile-foundation/Manifest b/gnustep-libs/etoile-foundation/Manifest
index d410722..30d7109 100644
--- a/gnustep-libs/etoile-foundation/Manifest
+++ b/gnustep-libs/etoile-foundation/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-foundation-0.2.ebuild 416 RMD160 43092f3bda36d29dff1e3734628bb949555e89ae SHA1 dd042890b3f7b9e085f112e798600f2df4d921d6 SHA256 c69d2271d42f94b8f849abb8668e33a9b3f476065c474c0c96da98bb149370af
-EBUILD etoile-foundation-0.4.0.ebuild 528 RMD160 e2a1c06613f2d89de886dd49a3b2aeaae08fc250 SHA1 50e7e6277796c59379c72c85875c57ead8f61a13 SHA256 efe78243bf57692c3db4fa1a7c5f5e5ed65f17a7b94dfde83e0a6f2ecb191af5
+DIST etoile-0.4.1.tar.gz 8966178 RMD160 aaaed1d8bb3d3c946de5c23ad1171a78526469ba SHA1 9ffa757bf42342fd6a2e7fa542b4521eee9c99d0 SHA256 91c9dc41f098d5681832ba8ce52690be8b2c45d85414d2c8388c3116c9e443d4
+EBUILD etoile-foundation-0.4.1.ebuild 735 RMD160 991d2e2d05f7c151e0aee869b462ecaeec74e9b9 SHA1 672906d3c2fec2d15ac65db470170252f86e05be SHA256 f607399eb7c1a7d465cce1ffc3d1441d049e217101ddccb2c645cdf0eea8b66c
diff --git a/gnustep-libs/etoile-foundation/etoile-foundation-0.2.ebuild b/gnustep-libs/etoile-foundation/etoile-foundation-0.2.ebuild
deleted file mode 100644
index 278293d..0000000
--- a/gnustep-libs/etoile-foundation/etoile-foundation-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}/Frameworks/EtoileFoundation"
-
-DESCRIPTION="Foundation framework extensions from the Etoile project"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/gnustep-libs/etoile-foundation/etoile-foundation-0.4.0.ebuild b/gnustep-libs/etoile-foundation/etoile-foundation-0.4.1.ebuild
index d86b32c..1a6de18 100644
--- a/gnustep-libs/etoile-foundation/etoile-foundation-0.4.0.ebuild
+++ b/gnustep-libs/etoile-foundation/etoile-foundation-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}/Frameworks/EtoileFoundation"
@@ -18,3 +20,10 @@ IUSE=""
 DEPEND=">=gnustep-base/gnustep-gui-0.16.0
 	>=gnustep-base/gnustep-gui-0.16.0"
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s#ADDITIONAL_OBJCFLAGS += -march=i586##" GNUmakefile || die "sed failed"
+
+	cd "${WORKDIR}/Etoile-${PV}"
+	sed -i -e "s/-Werror//" etoile.make || die "Werror sed failed"
+}
diff --git a/gnustep-libs/etoile-io/Manifest b/gnustep-libs/etoile-io/Manifest
deleted file mode 100644
index 5cfd414..0000000
--- a/gnustep-libs/etoile-io/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX etoile-io-0.2-multipledeclarations.patch 350 RMD160 c52b51afc397f327bb30fe3b4fa149a203df7881 SHA1 e1b38ad83c4d0b2863ace33f1a632b8469fccf23 SHA256 66e889608659d8d44b48c49e63233a62a749078a5129d33e75cc088aed216889
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD etoile-io-0.2.ebuild 762 RMD160 10b1b03a5c6802dbb86bda33c51e9918e007bd0d SHA1 6c70ebd66f2f72f10447bc5ceb763f3fdaea6f10 SHA256 99d1de94bc6f8e72ab89361b12d7a8283ab880958679e54f3b1770a10a689054
diff --git a/gnustep-libs/etoile-io/etoile-io-0.2.ebuild b/gnustep-libs/etoile-io/etoile-io-0.2.ebuild
deleted file mode 100644
index 3f284d4..0000000
--- a/gnustep-libs/etoile-io/etoile-io-0.2.ebuild
+++ /dev/null
@@ -1,32 +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}/Languages/Io"
-
-DESCRIPTION="Io language support in a convenient way for GNUstep developers or users"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="gnustep-libs/distributedview
-	>=gnustep-libs/steptalk-0.10"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${P}-multipledeclarations.patch
-	sed -i -e "s/IoVM/iovm/" GNUmakefile.steptalk || die "sed failed"
-}
-
-src_compile() {
-	egnustep_env
-	egnustep_make steptalk=yes || die "compilation failed"
-}
diff --git a/gnustep-libs/etoile-io/files/etoile-io-0.2-multipledeclarations.patch b/gnustep-libs/etoile-io/files/etoile-io-0.2-multipledeclarations.patch
deleted file mode 100644
index c1f8383..0000000
--- a/gnustep-libs/etoile-io/files/etoile-io-0.2-multipledeclarations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iovm/IoState_inline.h.orig	2008-06-16 15:47:57.000000000 +0200
-+++ iovm/IoState_inline.h	2008-06-16 15:48:15.000000000 +0200
-@@ -35,8 +35,6 @@
- #define IOFAILURE(self) IOFALSE(self)
- #define ISFAILURE(self) ISFALSE(self)
- 
--inline IoObject *IOBOOL(IoObject *self, int b);
--
- IOINLINE IoObject *IOTRUE(IoObject *self)
- {
- 	return IOSTATE->ioTrue;
diff --git a/gnustep-libs/etoile-serialize/Manifest b/gnustep-libs/etoile-serialize/Manifest
index 2191a6a..805ced4 100644
--- a/gnustep-libs/etoile-serialize/Manifest
+++ b/gnustep-libs/etoile-serialize/Manifest
@@ -1,2 +1,2 @@
-DIST etoile-0.4.0.tar.gz 8892225 RMD160 cf5396cdd2e4e8477f4ac1c493f814b862999a75 SHA1 3848ededa6f5f7981e208cea0c1833416b425e4c SHA256 785774e4697e7f1387d0c92c04886e6705d44272aeeb08ebd648871be5f5b59f
-EBUILD etoile-serialize-0.4.0.ebuild 523 RMD160 8c45bc32edeb66f15976ce3da5f24a387cab1f89 SHA1 fd6dadb62f820eeb7c469113098044b343ec5c11 SHA256 1dcfddd58b0b3a005a453460234d3c3ea5da9ec7179e83d3afe70379df230339
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD etoile-serialize-0.4.1.ebuild 654 RMD160 362d835cdd97ca2fba302f705851b99dd6c8d8f4 SHA1 9f906d8cd5757d172dba6d92b0e14d3aa6273050 SHA256 df16751c20fef325fecbab7a4628709a95b15dc6ea9a87a94b196760233f4466
diff --git a/gnustep-libs/etoile-serialize/etoile-serialize-0.4.0.ebuild b/gnustep-libs/etoile-serialize/etoile-serialize-0.4.1.ebuild
index c671093..004fa47 100644
--- a/gnustep-libs/etoile-serialize/etoile-serialize-0.4.0.ebuild
+++ b/gnustep-libs/etoile-serialize/etoile-serialize-0.4.1.ebuild
@@ -2,18 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit gnustep-2
 
 S="${WORKDIR}/Etoile-${PV}/Frameworks/EtoileSerialize"
 
 DESCRIPTION="Collection of classes that perform serialization and deserialization of arbitrary objects"
 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"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="gnustep-libs/etoile-foundation"
+DEPEND=">=gnustep-libs/etoile-foundation-${PV}"
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}/Etoile-${PV}"
+	sed -i -e "s/-Werror//" etoile.make || die "Werror sed failed"
+}
+
diff --git a/gnustep-libs/etoile-ui/Manifest b/gnustep-libs/etoile-ui/Manifest
index ab51197..0a3bc8d 100644
--- a/gnustep-libs/etoile-ui/Manifest
+++ b/gnustep-libs/etoile-ui/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-ui-0.2.ebuild 408 RMD160 6558f79ccc6eb20cfa9f3109978e31b605761ec3 SHA1 6026d5f3e165ad26bc974d9e32935905c770645f SHA256 70246e1ffa11df28fa7f517f78a22b76fa77c228a48f4545c2b0838487a4ace4
-EBUILD etoile-ui-0.4.0.ebuild 537 RMD160 7375ea3f52655aa606fd3bfc2fef3ace2158aa1a SHA1 c00d328f2a65be8145ee8f9bc3c061e239303141 SHA256 2795d45f81acadf24429f2b4cd11ecddf618c7e352e047c0fd28fad5ac517c32
+DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD etoile-ui-0.4.1.ebuild 554 RMD160 21d8502a2b8f5d62733b2a60441db81c2b658569 SHA1 7f7a4f46333fd5b0b5e576a597de34070d76757a SHA256 b98e36386c96cfb81bb1185b73842f4e1fcd852a03e1420414172b84a96bbff4
diff --git a/gnustep-libs/etoile-ui/etoile-ui-0.2.ebuild b/gnustep-libs/etoile-ui/etoile-ui-0.2.ebuild
deleted file mode 100644
index aee158b..0000000
--- a/gnustep-libs/etoile-ui/etoile-ui-0.2.ebuild
+++ /dev/null
@@ -1,14 +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}/Frameworks/EtoileUI"
-
-DESCRIPTION="AppKit framework extensions from 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"
diff --git a/gnustep-libs/etoile-ui/etoile-ui-0.4.0.ebuild b/gnustep-libs/etoile-ui/etoile-ui-0.4.1.ebuild
index b19c514..27592f8 100644
--- a/gnustep-libs/etoile-ui/etoile-ui-0.4.0.ebuild
+++ b/gnustep-libs/etoile-ui/etoile-ui-0.4.1.ebuild
@@ -8,13 +8,13 @@ S="${WORKDIR}/Etoile-${PV}/Frameworks/EtoileUI"
 
 DESCRIPTION="AppKit framework extensions from 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-base/gnustep-gui-0.16.0
-	gnustep-libs/etoile-foundation
-	gnustep-libs/coreobject"
+	>=gnustep-libs/etoile-foundation-${PV}
+	>=gnustep-libs/coreobject-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-libs/inspectorkit/Manifest b/gnustep-libs/inspectorkit/Manifest
deleted file mode 100644
index 1dc47b3..0000000
--- a/gnustep-libs/inspectorkit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD inspectorkit-0.2.ebuild 453 RMD160 b1e5b481611dee43d9ed10f47b606ccb1f81941f SHA1 d01a66633f51330042215c52280b597de5ba64b2 SHA256 3915e59319c73c67a66fc6fb9d96d08c99f8e306cdbc588ee04bfb47ea10ae51
diff --git a/gnustep-libs/inspectorkit/inspectorkit-0.2.ebuild b/gnustep-libs/inspectorkit/inspectorkit-0.2.ebuild
deleted file mode 100644
index ffddabc..0000000
--- a/gnustep-libs/inspectorkit/inspectorkit-0.2.ebuild
+++ /dev/null
@@ -1,17 +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}/Frameworks/InspectorKit"
-
-DESCRIPTION="Commonly used inspector adapted for Etoile"
-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/panekit"
-RDPEND="${DEPEND}"
diff --git a/gnustep-libs/opmlkit/Manifest b/gnustep-libs/opmlkit/Manifest
deleted file mode 100644
index 86368b0..0000000
--- a/gnustep-libs/opmlkit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD opmlkit-0.2.ebuild 389 RMD160 37c6c522b8862360aa5f6504ce092f86f8f5a9a5 SHA1 48154d0a37ee8655e00601447a1955a558af72da SHA256 63a0b60e5cd7600cadc7216d7e8c1837a532619f5d8c8c1467dcabc19bf31d88
diff --git a/gnustep-libs/opmlkit/opmlkit-0.2.ebuild b/gnustep-libs/opmlkit/opmlkit-0.2.ebuild
deleted file mode 100644
index 7ae6143..0000000
--- a/gnustep-libs/opmlkit/opmlkit-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}/Frameworks/OPMLKit"
-
-DESCRIPTION="OPML documents support framework"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/gnustep-libs/panekit/Manifest b/gnustep-libs/panekit/Manifest
deleted file mode 100644
index bc0fed4..0000000
--- a/gnustep-libs/panekit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD panekit-0.2.ebuild 426 RMD160 3e79e40a07109645bcd20a6ea1d90b4d75306f97 SHA1 33f8be0c87688f18bd0aa1c95217736358e979e9 SHA256 1076dda2541d1dd0c7824080e84f67a5e2848150e19ab0b9dadd9eaaabd6777d
diff --git a/gnustep-libs/panekit/panekit-0.2.ebuild b/gnustep-libs/panekit/panekit-0.2.ebuild
deleted file mode 100644
index 9447ff4..0000000
--- a/gnustep-libs/panekit/panekit-0.2.ebuild
+++ /dev/null
@@ -1,14 +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}/Frameworks/PaneKit"
-
-DESCRIPTION="provides various features to build flexible Pane-based interfaces"
-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"
diff --git a/gnustep-libs/rsskit/Manifest b/gnustep-libs/rsskit/Manifest
deleted file mode 100644
index d04b561..0000000
--- a/gnustep-libs/rsskit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD rsskit-0.2.ebuild 389 RMD160 36fb2b9725459bf6b03c60361dcdfdd81763e8aa SHA1 b72cf1fb35697f274e3d6ac7a112f068fca2301e SHA256 3b6ede6050baf7602fc0302bf235d31d189ed3261f610a4f8f3b3e9c87d99c1f
diff --git a/gnustep-libs/rsskit/rsskit-0.2.ebuild b/gnustep-libs/rsskit/rsskit-0.2.ebuild
deleted file mode 100644
index 3f24ba1..0000000
--- a/gnustep-libs/rsskit/rsskit-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}/Frameworks/RSSKit"
-
-DESCRIPTION="News feeds support framework"
-HOMEPAGE="http://www.etoile-project.org"
-SRC_URI="http://download.gna.org/etoile/etoile-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/gnustep-libs/service-menulet/Manifest b/gnustep-libs/service-menulet/Manifest
deleted file mode 100644
index e7be4a8..0000000
--- a/gnustep-libs/service-menulet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD service-menulet-0.2.ebuild 453 RMD160 c8b630f65386a14bb808aaba2d5dc2b30586ce33 SHA1 550df0a467d3f6f9c40bc88ee1c4a373eb362e3e SHA256 b89db95ab79d02396474b9c22a1ea15bb8bbda4b4874d9898a126b59e004dae6
diff --git a/gnustep-libs/service-menulet/service-menulet-0.2.ebuild b/gnustep-libs/service-menulet/service-menulet-0.2.ebuild
deleted file mode 100644
index cc0fa7c..0000000
--- a/gnustep-libs/service-menulet/service-menulet-0.2.ebuild
+++ /dev/null
@@ -1,16 +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}/Bundles/ServiceMenulet"
-
-DESCRIPTION="menulet to use services provided by GNUstep applications"
-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"
-
-RDEPEND="gnustep-apps/azbackground"
diff --git a/gnustep-libs/volumecontrol-menulet/Manifest b/gnustep-libs/volumecontrol-menulet/Manifest
deleted file mode 100644
index 0313fcd..0000000
--- a/gnustep-libs/volumecontrol-menulet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST etoile-0.2.tar.gz 21373391 RMD160 99aa05909469fc7ffae9118829a5f155050271c5 SHA1 9ecf33b0130687c1946da3eb7568605b5e9dfcbf SHA256 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-EBUILD volumecontrol-menulet-0.2.ebuild 466 RMD160 6c36dd0b193bf2c84b60f81b95b9946357d3be38 SHA1 8f5d12e583abc66bb76c5818bb1a44d865f8ff46 SHA256 6de3bfc8fc15be9f5f81daa0b0107c2f36703b636c47b054ab1a3449638460e2
diff --git a/gnustep-libs/volumecontrol-menulet/volumecontrol-menulet-0.2.ebuild b/gnustep-libs/volumecontrol-menulet/volumecontrol-menulet-0.2.ebuild
deleted file mode 100644
index 1d668e4..0000000
--- a/gnustep-libs/volumecontrol-menulet/volumecontrol-menulet-0.2.ebuild
+++ /dev/null
@@ -1,17 +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}/Bundles/VolumeControlMenulet"
-
-DESCRIPTION="menulet to control volume using SystemConfig"
-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/systemconfig"
-RDEPEND="${DEPEND}"