2021-06-20 21:42:47 UTC

43 files changed, 94 insertions, 77 deletions

diff --git a/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1 b/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
index 9dfc0d2181e2..f124a560730b 100644
--- a/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
+++ b/metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=Analog dockapp clock for GNUstep
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/aclock/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/AClock-0.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=2db9290a1dfb8c02653d583222f1b76b
diff --git a/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1 b/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
index a2599997f452..e97a2afb1cb7 100644
--- a/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
+++ b/metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=Apple Addressbook work alike (standalone and for GNUMail)
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/addresses/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Addresses-0.4.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=5a04be54555791d7ca877d1a655344aa
diff --git a/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4 b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
index 83c55fc000d4..b0b2e79a0543 100644
--- a/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
+++ b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://www.collaboration-world.com/affiche.data/releases/Stable/Affiche-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=a6c8a3f161fda0de7f4899710a3a3f6f
diff --git a/metadata/md5-cache/gnustep-apps/batmon-0.8 b/metadata/md5-cache/gnustep-apps/batmon-0.8
index 42cf44677853..1eb02aafed70 100644
--- a/metadata/md5-cache/gnustep-apps/batmon-0.8
+++ b/metadata/md5-cache/gnustep-apps/batmon-0.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/batmon-0.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=026119d02c107d136a2e8cfc1536e174
diff --git a/metadata/md5-cache/gnustep-apps/cdplayer-0.6.0 b/metadata/md5-cache/gnustep-apps/cdplayer-0.6.0
index 23c45f2c1892..01ddaf8590f1 100644
--- a/metadata/md5-cache/gnustep-apps/cdplayer-0.6.0
+++ b/metadata/md5-cache/gnustep-apps/cdplayer-0.6.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcdio dev-libs/libcdio-paranoia gnustep-apps/cynthiune dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/schik/cdplayer/archive/v0.6.0.tar.gz -> cdplayer-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=0e54dda7e4af44b33dd9b373ac37326e
diff --git a/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1 b/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
index 6d4404107e68..bf06b3d32cf0 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
+++ b/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://www.cenon.zone/download/source/Cenon-4.0.2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=d30ea5d78197be28e1a0942537b6f19c
diff --git a/metadata/md5-cache/gnustep-apps/cenon-4.0.6 b/metadata/md5-cache/gnustep-apps/cenon-4.0.6
index b06cdda6bae3..bb2c7002e4a4 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-4.0.6
+++ b/metadata/md5-cache/gnustep-apps/cenon-4.0.6
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
 EAPI=7
 HOMEPAGE=http://www.cenon.info/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Cenon
-RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://www.cenon.zone/download/source/Cenon-4.0.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=5fe07e9c0fe029ba54742b8d50cd91ca
diff --git a/metadata/md5-cache/gnustep-apps/cynthiune-1.0.0 b/metadata/md5-cache/gnustep-apps/cynthiune-1.0.0
index 8a8cca1b6b1d..dd06df26622c 100644
--- a/metadata/md5-cache/gnustep-apps/cynthiune-1.0.0
+++ b/metadata/md5-cache/gnustep-apps/cynthiune-1.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/audiofile media-libs/taglib alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( media-libs/libid3tag media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( media-libs/libmodplug ) timidity? ( media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.1.2 >=media-libs/libvorbis-1.0.1-r2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Cynthiune-1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=8a6fd884fffbeeb60d5683dc5d26314d
diff --git a/metadata/md5-cache/gnustep-apps/fisicalab-0.3.5 b/metadata/md5-cache/gnustep-apps/fisicalab-0.3.5
index e81b9e01ed69..70ccca4e7977 100644
--- a/metadata/md5-cache/gnustep-apps/fisicalab-0.3.5
+++ b/metadata/md5-cache/gnustep-apps/fisicalab-0.3.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://gnu/fisicalab/fisicalab-0.3.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=a32c59f49fe286f275ec7b506c367fd4
diff --git a/metadata/md5-cache/gnustep-apps/ftp-0.5 b/metadata/md5-cache/gnustep-apps/ftp-0.5
index e46a6de2bfdd..635152116696 100644
--- a/metadata/md5-cache/gnustep-apps/ftp-0.5
+++ b/metadata/md5-cache/gnustep-apps/ftp-0.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/metadata/md5-cache/gnustep-apps/ftp-0.6 b/metadata/md5-cache/gnustep-apps/ftp-0.6
index fbe041c5a199..e3c35c2a8d42 100644
--- a/metadata/md5-cache/gnustep-apps/ftp-0.6
+++ b/metadata/md5-cache/gnustep-apps/ftp-0.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/metadata/md5-cache/gnustep-apps/gemas-0.4 b/metadata/md5-cache/gnustep-apps/gemas-0.4
index 22f53ea2e748..03bfa6cfcf9a 100644
--- a/metadata/md5-cache/gnustep-apps/gemas-0.4
+++ b/metadata/md5-cache/gnustep-apps/gemas-0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 projectcenter? ( gnustep-apps/projectcenter ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/Gemas-0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=0b0390454515f7e63cf140c50714e375
diff --git a/metadata/md5-cache/gnustep-apps/gmines-0.2-r1 b/metadata/md5-cache/gnustep-apps/gmines-0.2-r1
index 853309b28bad..ada5dc61ec08 100644
--- a/metadata/md5-cache/gnustep-apps/gmines-0.2-r1
+++ b/metadata/md5-cache/gnustep-apps/gmines-0.2-r1
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=The well-known minesweeper game
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/gmines/index.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=82d4f10644c42dc416d84c6b209dea80
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.2.2 b/metadata/md5-cache/gnustep-apps/gnumail-1.2.2
index e61ba8612d32..b015716e189b 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.2.2
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=c24768da5b3211f873b57793dd754f92
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.2.3 b/metadata/md5-cache/gnustep-apps/gnumail-1.2.3
index b5197cee7ee1..6da15efbc7b5 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.2.3
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.2.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=282588b7a6d3fd36654c2314d992462c
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.3.0 b/metadata/md5-cache/gnustep-apps/gnumail-1.3.0
index 0ba4fd80f541..1807a510510c 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.3.0
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=aa36d0c3506bfdd85d4ff2b310184e86
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.23 b/metadata/md5-cache/gnustep-apps/gorm-1.2.23
index 327fd4b98d0e..619beed41ddf 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.23
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.23
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.23.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=cc2d80026bda698883743e5d8a1d2eed
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.24 b/metadata/md5-cache/gnustep-apps/gorm-1.2.24
index e6001b91a7c6..c21238291e32 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.24
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.24
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=01288f54f0d42890ba3f26b59b42a4de
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.26 b/metadata/md5-cache/gnustep-apps/gorm-1.2.26
index bf6d28d7fd81..577492f76be1 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.26
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.26
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
 DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
 EAPI=7
 HOMEPAGE=http://www.gnustep.org/experience/Gorm.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.26.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=e9f0a37335e4a6169a9939b0cf405a0f
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.28 b/metadata/md5-cache/gnustep-apps/gorm-1.2.28
index 8dfafb182b4d..077dc907e07a 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.28
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.28
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
 DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
 EAPI=7
 HOMEPAGE=http://www.gnustep.org/experience/Gorm.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.28.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=c7767660e803e4f8fcec0ee68ec7b0b0
diff --git a/metadata/md5-cache/gnustep-apps/graphos-0.6 b/metadata/md5-cache/gnustep-apps/graphos-0.6
index eb6a73fa82db..74534de5cae4 100644
--- a/metadata/md5-cache/gnustep-apps/graphos-0.6
+++ b/metadata/md5-cache/gnustep-apps/graphos-0.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Graphos-0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=4225d8045095ce8ce9a95c28155785cb
diff --git a/metadata/md5-cache/gnustep-apps/graphos-0.7 b/metadata/md5-cache/gnustep-apps/graphos-0.7
index f0e401c5616e..71e1007e1d41 100644
--- a/metadata/md5-cache/gnustep-apps/graphos-0.7
+++ b/metadata/md5-cache/gnustep-apps/graphos-0.7
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=vector drawing application centered around bezier paths
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/graphos/index.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Graphos-0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=cead78dec8677ddcf4dcc765bc59dd5c
diff --git a/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1 b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1
index 31117b935a2c..ab03012c9814 100644
--- a/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1
+++ b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/GShisen-1.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=1427d204f922e458539223d7ca95d840
diff --git a/metadata/md5-cache/gnustep-apps/gspdf-0.5 b/metadata/md5-cache/gnustep-apps/gspdf-0.5
index e05de4f332f2..d040c2d22317 100644
--- a/metadata/md5-cache/gnustep-apps/gspdf-0.5
+++ b/metadata/md5-cache/gnustep-apps/gspdf-0.5
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=Postscript and Pdf Viewer using GhostScript
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/gspdf/index.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=app-text/ghostscript-gpl virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/GSPdf-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=1eb853e67017db4b524993cfba8a1d76
diff --git a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4 b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4
index c1988076b7cc..0dceb6075a9b 100644
--- a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4
+++ b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.25.0 gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791 >=dev-db/sqlite-3.2.8 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=4d4d2d710f30c6c0282a56cda84f55e9
diff --git a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2 b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
index 28d842c8f3bb..fab2927efbca 100644
--- a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
+++ b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=a Tetris-like game where each player is effected by the others game play
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/lapispuzzle/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/LapisPuzzle-1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=cd6eba968bda445c85c3e1737e127fb8
diff --git a/metadata/md5-cache/gnustep-apps/laternamagica-0.5 b/metadata/md5-cache/gnustep-apps/laternamagica-0.5
index aca9a89bbf61..e06612980973 100644
--- a/metadata/md5-cache/gnustep-apps/laternamagica-0.5
+++ b/metadata/md5-cache/gnustep-apps/laternamagica-0.5
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=an image viewer and slideshow application
 EAPI=7
 HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=0d05741c6b1cd614302128703660a23d
diff --git a/metadata/md5-cache/gnustep-apps/mpdcon-1.5.1 b/metadata/md5-cache/gnustep-apps/mpdcon-1.5.1
index 177874ea6507..8d016fceaf29 100644
--- a/metadata/md5-cache/gnustep-apps/mpdcon-1.5.1
+++ b/metadata/md5-cache/gnustep-apps/mpdcon-1.5.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libbsd >=gnustep-libs/sqlclient-1.6.0[sqlite] >=media-libs/libmpdclient-2.7 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/MPDCon-1.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=b931308db9f02102cb957d9868f2b51f
diff --git a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3 b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
index 5f9a5b7db22c..adb330050bf1 100644
--- a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
+++ b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=digital picture frame software
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/gap/pictureframe/index.html
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=89d35d60352d12f79102b10dc9e4aca0
diff --git a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta10 b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta10
index 6babd95e71c1..9cec0a53e3c1 100644
--- a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta10
+++ b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta10
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=virtual/gnustep-back-0.25.0 virtual/gnustep-back
 DESCRIPTION=a free application for drawing & editing pixel-art images
 EAPI=7
 HOMEPAGE=http://twilightedge.com/mac/pikopixel/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
-RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=virtual/gnustep-back-0.25.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://twilightedge.com/downloads/PikoPixel.Sources.1.0-b10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=3ae87a0fdf6a74a280059b4374904905
diff --git a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4 b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
index c183d4b08f05..01d4ae95eb33 100644
--- a/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
+++ b/metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=virtual/gnustep-back-0.25.0 virtual/gnustep-back
 DESCRIPTION=a free application for drawing & editing pixel-art images
 EAPI=7
 HOMEPAGE=http://twilightedge.com/mac/pikopixel/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
-RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=virtual/gnustep-back-0.25.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9c.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=474c8ee2a28f497cafac72e92a29eb36
diff --git a/metadata/md5-cache/gnustep-apps/preview-0.9 b/metadata/md5-cache/gnustep-apps/preview-0.9
index a3429489c22b..69ca12a5d179 100644
--- a/metadata/md5-cache/gnustep-apps/preview-0.9
+++ b/metadata/md5-cache/gnustep-apps/preview-0.9
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://www.sonappart.net/softwares/preview/download/Preview-0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=bac9d106cc824736922afe489d522dd0
diff --git a/metadata/md5-cache/gnustep-apps/price-1.2.0 b/metadata/md5-cache/gnustep-apps/price-1.2.0
index fbe486b841ff..3d41ccef70b4 100644
--- a/metadata/md5-cache/gnustep-apps/price-1.2.0
+++ b/metadata/md5-cache/gnustep-apps/price-1.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://sourceforge/price/PRICE-1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=3f687962463bbf8d646dcb42882f05f2
diff --git a/metadata/md5-cache/gnustep-apps/price-1.3.0 b/metadata/md5-cache/gnustep-apps/price-1.3.0
index 8e6b9129aedd..968f7bdb6cc5 100644
--- a/metadata/md5-cache/gnustep-apps/price-1.3.0
+++ b/metadata/md5-cache/gnustep-apps/price-1.3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://sourceforge/price/PRICE-1.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=3760a65df25fa3c06b5fad3f622729f0
diff --git a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.2 b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.2
index 0b17ab374030..00ddf0aa4b6a 100644
--- a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.2
+++ b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/gdb-6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://ftpmain.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-0.6.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=bb3889914e46bc1ecbd8bf40a4c1b1f4
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.44 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.44
index d513f536938c..5e97060ccba6 100644
--- a/metadata/md5-cache/gnustep-apps/simpleagenda-0.44
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.44
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) virtual/gnustep-back
 DESCRIPTION=a simple calendar and agenda application
 EAPI=7
 HOMEPAGE=https://github.com/poroussel/simpleagenda
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=dbus debug doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/poroussel/simpleagenda/archive/v0.44.tar.gz -> simpleagenda-0.44.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=56c7a8d789bcbd765a6e5d959a2fb818
diff --git a/metadata/md5-cache/gnustep-apps/sogo-4.3.2 b/metadata/md5-cache/gnustep-apps/sogo-4.3.2
index 184846c5a9ac..a964b16b1709 100644
--- a/metadata/md5-cache/gnustep-apps/sogo-4.3.2
+++ b/metadata/md5-cache/gnustep-apps/sogo-4.3.2
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.3.2[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.3.2[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.6.3 virtual/gnustep-back
 DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
 EAPI=7
 HOMEPAGE=http://www.sogo.nu
@@ -7,8 +8,8 @@ INHERIT=gnustep-2 vcs-snapshot
 IUSE=activesync gnutls +ssl debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.3.2[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.3.2[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-4.3.2.tar.gz -> sogo-4.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=734d1aa5bba57221eb83940bfe09baf4
diff --git a/metadata/md5-cache/gnustep-apps/sogo-5.1.1 b/metadata/md5-cache/gnustep-apps/sogo-5.1.1
index 8d34b6d9a698..f0bbae1df148 100644
--- a/metadata/md5-cache/gnustep-apps/sogo-5.1.1
+++ b/metadata/md5-cache/gnustep-apps/sogo-5.1.1
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-5.1.1[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-5.1.1[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.6.3 virtual/gnustep-back
 DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
 EAPI=7
 HOMEPAGE=http://www.sogo.nu
@@ -7,8 +8,8 @@ INHERIT=gnustep-2 vcs-snapshot
 IUSE=activesync gnutls +ssl debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-5.1.1[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=acct-user/sogo dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-5.1.1[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-5.1.1.tar.gz -> sogo-5.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=729a92e9aaeb44639097f36d56a07f70
diff --git a/metadata/md5-cache/gnustep-apps/systempreferences-1.2.0 b/metadata/md5-cache/gnustep-apps/systempreferences-1.2.0
index dc1639ba6e79..998d5740e821 100644
--- a/metadata/md5-cache/gnustep-apps/systempreferences-1.2.0
+++ b/metadata/md5-cache/gnustep-apps/systempreferences-1.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-1.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=6d3a94974928894d811227f394a57b8e
diff --git a/metadata/md5-cache/gnustep-apps/talksoup-1.1 b/metadata/md5-cache/gnustep-apps/talksoup-1.1
index 4e21d1b35fe6..3e6710705e08 100644
--- a/metadata/md5-cache/gnustep-apps/talksoup-1.1
+++ b/metadata/md5-cache/gnustep-apps/talksoup-1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-libs/netclasses-1.1.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/TalkSoup-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=ed6b5d8458f918a02d8abc21472246df
diff --git a/metadata/md5-cache/gnustep-apps/terminal-0.9.9 b/metadata/md5-cache/gnustep-apps/terminal-0.9.9
index a86ba2f35281..5c8d9bc354e0 100644
--- a/metadata/md5-cache/gnustep-apps/terminal-0.9.9
+++ b/metadata/md5-cache/gnustep-apps/terminal-0.9.9
@@ -1,5 +1,6 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DEPEND=virtual/gnustep-back
 DESCRIPTION=A terminal emulator for GNUstep
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/gap/terminal/
@@ -7,8 +8,8 @@ INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+RDEPEND=virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	6da6797255ab7fb848a02afa0cbc406f	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=f7baa4040c9a62ca48257af39377b0a0
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
index 183b077ef8f3..a563bd30e5dc 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=3a9e88c906d9fa680225edd67a4ac384
diff --git a/metadata/md5-cache/gnustep-apps/zipper-1.5 b/metadata/md5-cache/gnustep-apps/zipper-1.5
index 8fb176a1279b..5c55a4b720b7 100644
--- a/metadata/md5-cache/gnustep-apps/zipper-1.5
+++ b/metadata/md5-cache/gnustep-apps/zipper-1.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Zipper-1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	6da6797255ab7fb848a02afa0cbc406f	toolchain-funcs	2545dc6f0aaecb2dea61424911e82674	multilib	ba7da83f763a749a2870c28785c6dc0b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	6bfa9a1953cacbe9bb42fbfee02e8d1b	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	f93c6ebbcd4a4e3e3f2328a13511b73a	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnustep-base	8c806c9ee510ed24bdae0a753c6206ef	gnustep-2	e5ceff53773635610140eedce5d493c7
 _md5_=97f8f7a921b9db6217e0d69ed86c0ca5