gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:58:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:58:29 +0100
commit: 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree: 07815070629c7c11000a7f51ceb8ccbccb49a809 /gnustep-apps
parent: 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)
156 files changed, 520 insertions, 2122 deletions
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 350b76e35f12..fdb4c7e2dd2b 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/aclock-0.4.0 b/gnustep-apps/aclock-0.4.0
new file mode 100644
index 000000000000..ae657f36415d
--- /dev/null
+++ b/gnustep-apps/aclock-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Analog dockapp clock for GNUstep
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/aclock/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-3
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/AClock-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fed42bb780228c9ed669ba58f8a30db9
diff --git a/gnustep-apps/aclock/Manifest b/gnustep-apps/aclock/Manifest
deleted file mode 100644
index 674c2c86c26b..000000000000
--- a/gnustep-apps/aclock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AClock-0.4.0.tar.gz 299488 BLAKE2B 36f41fe1abcc0de77b4d4c9f9be1af46a5c7741b7f71596803bb2debbd57cf750d4c8c87e86f00f185e20ef8f26ac3e795edd8fe4a5e462f3cfdb991780ff8b7 SHA512 45435e6b1e02b8fb6b924c7fbb5546f3836b7ee8a072323a5b7df0cf855b1a7f838234fb6318c558189f5a12e29275c2c85f61c4c989bfb5dbebfd087a5a7561
-EBUILD aclock-0.4.0.ebuild 600 BLAKE2B 8f2ff54d8d2a83e33ed4c1b62f4fdff948f2b1915d2335bb3719128cd1cb42daf2d483796a8cde78e3dc44644c5309870c98390cfd9068e2834029fbc9cace61 SHA512 29e54acef6fcdac6fefe0e4e8545a58472a6b03b19f3c1ad4125778d978d69fca16995965f417b9de4d8fd61617ee0154d9db1fd2f67dbbc453f2f863b7ca9d1
-MISC metadata.xml 502 BLAKE2B 90c79de83b11e608a34c9e89eddf66384af448441b98f78baecfe41c6abf39217679cea26dc8e7557521003bca52c0cdd5f83f2cef111dd46a4299d76022485a SHA512 0503620550f83aabe426fdad0dea14e0087ff4adc0013c69047b2330896b8afcad2d926d25817ec991a7607487810904f0a2438965c9738cda9414313e7c5e33
diff --git a/gnustep-apps/aclock/aclock-0.4.0.ebuild b/gnustep-apps/aclock/aclock-0.4.0.ebuild
deleted file mode 100644
index e5bcfc00d458..000000000000
--- a/gnustep-apps/aclock/aclock-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=${P/ac/AC}
-DESCRIPTION="Analog dockapp clock for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/aclock/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-gnustep_config_script() {
-	echo "echo ' * using smooth seconds'"
-	echo "defaults write AClock SmoothSeconds YES"
-	echo "echo ' * setting refresh rate to 0.1 seconds'"
-	echo "defaults write AClock RefreshRate 0.1"
-}
diff --git a/gnustep-apps/aclock/metadata.xml b/gnustep-apps/aclock/metadata.xml
deleted file mode 100644
index 04b3a9815251..000000000000
--- a/gnustep-apps/aclock/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-A clock!
-	
-Advantages of GNUstep dockapps over non GNUstep dockapps
-+ scalable
-+ independant of X11
-
-Thanks
-Alexander Malmberg for the initial version
-Banlu Kemiyatorn for the eye candy
-
-Contact
-Gürkan Sengün 
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/addresses-0.4.8 b/gnustep-apps/addresses-0.4.8
new file mode 100644
index 000000000000..dc6ed17d0b62
--- /dev/null
+++ b/gnustep-apps/addresses-0.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Addresses is a Apple Addressbook work alike (standalone and for GNUMail)
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/addresses/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Addresses-0.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=02b7715654e9d38b5a4e7ebebb0fb457
diff --git a/gnustep-apps/addresses/Manifest b/gnustep-apps/addresses/Manifest
deleted file mode 100644
index ad25ec34e868..000000000000
--- a/gnustep-apps/addresses/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX addresses-0.4.7-as-needed.patch 1041 BLAKE2B d31e425f7a6807bb0ada248e749d43695c5d0a304a3b6310bbe67c8e65c3d12beed374b6f15dda56b2bb63cbd8d81c90feeab0266e3ae99351a61c23dbddc615 SHA512 7999d1f420af2300f30efa96763b390cda9c16a9c37a8ea1fe0dc816874239857f3c5df8d1861203ab06c94e92e0887954c0acb7fcf6eb3ff074158c3a3ebb99
-DIST Addresses-0.4.8.tar.gz 287207 BLAKE2B 68387772f7fe1597b898afcd5f2c4254aa3174cd7ee494f155a9e79c84e3fc4c526c358f37464d6e2cddafaf5ec6b92b5bd646f03afedad3954fe5068bed0d56 SHA512 2cd6bd16620d3fa4136242dd89c3281800bba0caeb99e986d3d6beacf31ae19b3dd7f563da2fe52038781cca639815dfc740c15b0e5273facf8cc2400d90fc0f
-EBUILD addresses-0.4.8.ebuild 496 BLAKE2B 1f24919d86324b31daf86afeef9a3f4a0513c3edbd03da2354a7c537c0d2fc538d39faf24779132e263d1fab29c8aec2fbd6918df616b167dc1ef3fde564f760 SHA512 3849cfb5771320731633239edf4329b1938b13507a6296b7b5a6641095b7773b32ee10ceb85f3786379d6db6d4870325cdcc0cd504451c752010d1a1a787e30b
-MISC metadata.xml 585 BLAKE2B 301402f548058abc9225d7d41df354c9c2fa6c86890c0381461405d8c56b482e4e3193c732a9af6735f88200128e782f395bd70418d303026ba1c2b3fe644ed3 SHA512 0080e2aebc0af5124766886742c73d4c999e07dec9c17c78e771889feb14cf60b0201b3f7c8e1c8105af1a525df0b3bbdc82116a02485e2566c0c41108ae6f14
diff --git a/gnustep-apps/addresses/addresses-0.4.8.ebuild b/gnustep-apps/addresses/addresses-0.4.8.ebuild
deleted file mode 100644
index 615716950373..000000000000
--- a/gnustep-apps/addresses/addresses-0.4.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="Addresses is a Apple Addressbook work alike (standalone and for GNUMail)"
-HOMEPAGE="http://gap.nongnu.org/addresses/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/a/A}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${P/a/A}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.7-as-needed.patch
-}
diff --git a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
deleted file mode 100644
index cdb7a84755e3..000000000000
--- a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur AddressManager.orig/GNUmakefile AddressManager/GNUmakefile
---- AddressManager.orig/GNUmakefile	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile	2008-12-08 17:19:28.000000000 +0100
-@@ -24,8 +24,7 @@
- AddressManager_OBJCFLAGS=-I../Frameworks -Wall
- AddressManager_LDFLAGS=\
- 	-L../Frameworks/AddressView/AddressView.framework/$(GNUSTEP_TARGET_LDIR) \
--	-L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR)     \
--	-lAddressView -lAddresses
-+	-L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR)
- 
- -include GNUmakefile.preamble
- -include GNUmakefile.local
-diff -Naur AddressManager.orig/GNUmakefile.preamble AddressManager/GNUmakefile.preamble
---- AddressManager.orig/GNUmakefile.preamble	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile.preamble	2008-12-08 17:19:24.000000000 +0100
-@@ -27,7 +27,7 @@
- # ObjC stuff
- ADDITIONAL_OBJC_LIBS +=
- # Tools
--ADDITIONAL_TOOL_LIBS +=
-+ADDITIONAL_TOOL_LIBS += -lAddressView -lAddresses
- # WebObjects
- ADDITIONAL_WO_LIBS +=
- 
diff --git a/gnustep-apps/addresses/metadata.xml b/gnustep-apps/addresses/metadata.xml
deleted file mode 100644
index 01ac24293f53..000000000000
--- a/gnustep-apps/addresses/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-This package constitutes a personal address manager for the GNUstep
-software system. It allows archiving complete personal contact
-information, organizing contacts in groups, integration with other
-software such as mail clients and sharing address information with
-other users over the network.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/affiche-0.6.0-r4 b/gnustep-apps/affiche-0.6.0-r4
new file mode 100644
index 000000000000..ced30061b396
--- /dev/null
+++ b/gnustep-apps/affiche-0.6.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Affiche allows people to 'stick' notes
+EAPI=6
+HOMEPAGE=http://www.collaboration-world.com/affiche
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.collaboration-world.com/affiche.data/releases/Stable/Affiche-0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a6c8a3f161fda0de7f4899710a3a3f6f
diff --git a/gnustep-apps/affiche/Manifest b/gnustep-apps/affiche/Manifest
deleted file mode 100644
index 43a525b3dcf7..000000000000
--- a/gnustep-apps/affiche/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Affiche-0.6.0.tar.gz 50764 BLAKE2B f3d965c7f3c4d0a654a75fccaf2b6ce1cfeb7e1c688a927375e919e07cf85f0f3af2d6209cd7e061dbb575f979e8e8c69ec2831fa96ffd3ef1399f17997bf4b5 SHA512 114b323e8db0fa104fed5a94a544e481e8574a0af367951dfb1e400a15b0813564e433a12d33828f230b1f5f83578d161afad12e014f786e2e5bb60e90f637bc
-EBUILD affiche-0.6.0-r4.ebuild 406 BLAKE2B dc4ee36920f69b3ad75d791565a37368d32f94da9b91bfe6cb5d6490e173b908ef6ebe41b8574bddd1d50e78050f3dde833e9fda714d19334ec60e472d3a9ff9 SHA512 fc0805a87c78a622b1641062add558c190e867e29c0e820d6ce064dcb747c71e6c7e69931de0cee8d7790e175c0fc9d57fedff0e60a3939cf3147cc0fa8e7b7c
-MISC metadata.xml 648 BLAKE2B 1c772c620fe2af0ad172887c5a01c43a8e44913d171e0cc75c976fc160322eedca0cf9e67288c95e35021b10d3e7dcc57398bf76eba0a31870e081410c3404db SHA512 841bcebebad5a6db057e8fe0bf0b959193ea029ddf5b1093abbffed96c6dbe875f76137cba61345c2d3fe3acc6f8b6cba426447033ea784ff8c9ee3aaafb92a3
diff --git a/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild b/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
deleted file mode 100644
index c35fb5b43927..000000000000
--- a/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="Affiche allows people to 'stick' notes"
-HOMEPAGE="http://www.collaboration-world.com/affiche"
-SRC_URI="http://www.collaboration-world.com/affiche.data/releases/Stable/${P/a/A}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S=${WORKDIR}/${PN/a/A}
diff --git a/gnustep-apps/affiche/metadata.xml b/gnustep-apps/affiche/metadata.xml
deleted file mode 100644
index 3775b344aa81..000000000000
--- a/gnustep-apps/affiche/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Affiche is a little application that allows people to "stick" little notes on their computer desktop. It works well under GNUstep and under Apple Mac OS X.
-
-The goal of this little application is to provide a good example on how to develop cross-platform applications between GNUstep and Apple Mac OS X while providing a useful application at the same time.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/batmon-0.8 b/gnustep-apps/batmon-0.8
new file mode 100644
index 000000000000..21f030c7d49f
--- /dev/null
+++ b/gnustep-apps/batmon-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=displays the status of your laptop battery
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/gap/batmon/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/batmon-0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=026119d02c107d136a2e8cfc1536e174
diff --git a/gnustep-apps/batmon/Manifest b/gnustep-apps/batmon/Manifest
deleted file mode 100644
index 1d89a138cb14..000000000000
--- a/gnustep-apps/batmon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST batmon-0.8.tar.gz 39592 BLAKE2B 009067b85e3f44f9aa4bc1c23d139406c2e5d597c40380b6d3e6f3b9e653733b54cfda143ba0331b47df0702c15d04129603fe55b05165121fcb0ecdf4668b91 SHA512 b43a882f809307ef3dbdba9762bef443063d3d6c70bc202c4cd1e9a50a3f4b617607392e8777b4f6dfec89fb17a806ca19c256d2799d2b60f4e00b1fc334f2ce
-EBUILD batmon-0.8.ebuild 366 BLAKE2B c9caa7a41fae860cfb9f231b122709a4249d4035d2b3c7f06e509dfb983b979cf4d9f1b56e031fd6b32c681a2face4f35d8c169b931630a921c7548444818c08 SHA512 53b185fc36e3348991636971a5620cb3033257106674c23ab2c4e0f600268fed985c1471695ae64453f4cc27e0dfbc1d191383b9d2e7736e27b4300e7945c646
-MISC metadata.xml 502 BLAKE2B d4fdc3a7e4aaaa1e0e1338cd3ea21175c560f0c47952fd16ead241430d72ccbbe5cee60355a18a611c934b80b05512ae788674f5f48f535ea946f145ea0ea77e SHA512 914f476bbba4630393c354470ab80b22af38eb7d321b2c4bda564ff6032f931e6f20774c960acb63d028cf093d9767370d0868f8c14ed3133da8394ccb592f88
diff --git a/gnustep-apps/batmon/batmon-0.8.ebuild b/gnustep-apps/batmon/batmon-0.8.ebuild
deleted file mode 100644
index fad43fccded1..000000000000
--- a/gnustep-apps/batmon/batmon-0.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="displays the status of your laptop battery"
-HOMEPAGE="http://www.nongnu.org/gap/batmon/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/gnustep-apps/batmon/metadata.xml b/gnustep-apps/batmon/metadata.xml
deleted file mode 100644
index ac0a35517291..000000000000
--- a/gnustep-apps/batmon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Battery monitor is a small utility that displays the status of your laptop battery (charge/discharge and status). I works best with linux 2.6 kernels and ACPI, but now has also support for 2.4 kernels and APM</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/cdplayer-0.6.0 b/gnustep-apps/cdplayer-0.6.0
new file mode 100644
index 000000000000..794e382ba77c
--- /dev/null
+++ b/gnustep-apps/cdplayer-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libcdio dev-libs/libcdio-paranoia gnustep-apps/cynthiune dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Small CD Audio Player for GNUstep
+EAPI=5
+HOMEPAGE=https://github.com/schik/cdplayer
+IUSE=dbus debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdio dev-libs/libcdio-paranoia gnustep-apps/cynthiune dbus? ( gnustep-libs/dbuskit ) !gnustep-libs/cddb >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/schik/cdplayer/archive/v0.6.0.tar.gz -> cdplayer-0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=00160e334256d17ed9a7b9f9eb778168
diff --git a/gnustep-apps/cdplayer/Manifest b/gnustep-apps/cdplayer/Manifest
deleted file mode 100644
index 5e67b91d6728..000000000000
--- a/gnustep-apps/cdplayer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cdplayer-0.6.0.tar.gz 365695 BLAKE2B 3bf32a0c6ed70da3653be4dee6a59147e5d184d411f823a2d76bb67b0efe801a9cad2ca2b58529e567bafa4ef7a1726f5306870c5702de5d2c5287e5f81c3d5f SHA512 a777a8eb3b924fca7905b8063d9cbc64f1b3b5efd8f6ebcb4366c69e5c085d14cc416a25d6b389025d7ac2f80ee08e2adc742aa96c2c9f70170af22c807b7809
-EBUILD cdplayer-0.6.0.ebuild 794 BLAKE2B 0fd9ae6d5e111481293287a14b086053dff36f3f73a4d57e2b5dec18136d5bb8deba3b4660c0e4eac9dcb405f3758c69460c0631ffd3f95c3f66ce013ef3ac6c SHA512 4454f9a3d4392a6849573822a0085a36f47077e42b06ec27e3cfbfdcf415aaecb18565a60762c196953d26d84bdf253a0f7d9339e41b19b0bbefbbf8bf9fe92b
-MISC metadata.xml 406 BLAKE2B 4a2fe010de2675027505344ccbeddd75371138a86edda29dd5c2bb7247bd034af9774935d194abffcca3bbe3b8ebdad0b728b1286d61fc43a21fc302ffcea396 SHA512 220c1fa1624b8498de6601dc6225e322025a50b60ceb40401ec740a74cb0c6097210e749e6724ca6c146af33e7b696590bed08b8a030af3b7b3a7f2c7a7d24b2
diff --git a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
deleted file mode 100644
index 673668b295a7..000000000000
--- a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="Small CD Audio Player for GNUstep"
-HOMEPAGE="https://github.com/schik/cdplayer"
-SRC_URI="https://github.com/schik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dbus"
-DEPEND="dev-libs/libcdio
-	dev-libs/libcdio-paranoia
-	gnustep-apps/cynthiune
-	dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}
-	!gnustep-libs/cddb"
-
-src_prepare() {
-	sed -e "s#cdda.h#paranoia/cdda.h#" \
-		-e "s#paranoia.h#paranoia/paranoia.h#" \
-		-i AudioCD/AudioCD.h || die "AudioCD.h sed failed"
-}
-
-src_compile() {
-	local myconf=""
-	use dbus || myconf="${myconf} notifications=no"
-
-	egnustep_env
-	egnustep_make ${myconf}
-}
diff --git a/gnustep-apps/cdplayer/metadata.xml b/gnustep-apps/cdplayer/metadata.xml
deleted file mode 100644
index b4a454b1a467..000000000000
--- a/gnustep-apps/cdplayer/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Small CD Audio Player for GNUstep</longdescription>
-	<upstream>
-		<remote-id type="github">schik/cdplayer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/cenon-4.0.2-r1 b/gnustep-apps/cenon-4.0.2-r1
new file mode 100644
index 000000000000..fee63096b7fa
--- /dev/null
+++ b/gnustep-apps/cenon-4.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
+EAPI=5
+HOMEPAGE=http://www.cenon.info/
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.cenon.zone/download/source/Cenon-4.0.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d30ea5d78197be28e1a0942537b6f19c
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
deleted file mode 100644
index 6c359a4dacb7..000000000000
--- a/gnustep-apps/cenon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cenon-4.0.2-check-return-value.patch 1416 BLAKE2B fa71100d4dc75119f3b853ad246ce81a9703d26fd1a90ed8a40cf34d1c472f15a94c5328e333b616d820aef9bbf7d6426b612ef1b92c118eeda90595bedbf372 SHA512 07cd48ed24fc791a5b3921cae99b4bcd9a36167b1d4c376881b82f420c7870ea2ae02aaf1cade56bc88b3f306154e60d3e64a9c2b6fe880ead317250e0ada921
-AUX cenon-4.0.2-gnustep-gui-0.24-support.patch 7456 BLAKE2B 87be676970631e905cef75c1d4f7fa4b49449c24987d561851a888e0e510d18ed645047baf8b50db42ef045fc49f2de34a7c6878b2598eca5b5ad67a14b38439 SHA512 a740fda5548284d4d6ad46d972c19b23382b6d0e4b92573c9edebe1eb362f13863bc9e8b50fcfd0c9f450fea979ba781ce3723fe692f862ed23fc0e7f02b23b7
-AUX cenon-4.0.2-install.patch 690 BLAKE2B 64eff078e98b8d4052af2801517c0712384222007eb3af343f92793a42d4f4b5fdcc347b70b8832062471b73a13eb32d811de7a26b18e0b70005d4cc57b3de1c SHA512 fece9ed365b6fa5ca2b897b64c073eb780c6270f6e7f8c7e92748c54626cda3a47872245869f4e3ba8b8fbd9ee8bf8665b0feb1574daca006f828d363e95ad21
-DIST Cenon-4.0.2.tar.bz2 4150615 BLAKE2B 75252c6495c0cdba32f18e31674ff1c4f8e3d6c7f94b56ac763bcd7d8bcb401fe6817e0a06642dc927ff87c32956e9277a777a7744a8a33135a4e3a76aa511cc SHA512 94bf95dbdb8fbe9c21fbe80cbc33fbe376c598cf79be295cb1045a0ac888da5363f388f3f051d593ca47f6c1fcbade2825389aec5da328c59158a1e5da89db75
-EBUILD cenon-4.0.2-r1.ebuild 677 BLAKE2B 6ceb3cd274d1c4f3f24713fbf6fc26a7527bd89cf905eacd3ae8b215cc6aeb040b804386ef5a11b5801007f1c3a39b717e4a2c53ddd04d2bd28a222052c82716 SHA512 f52dfb053603ecfee1a702e9e6ed28d3247401ebcc68aae84af489c9d3878bb8040a7113bbc50fe90fa8ffc1e9de190e5b9e7819aac56fe8fee434e500b36ee9
-MISC metadata.xml 447 BLAKE2B cb51c659c741f694f0e13e16113d92e3211b52105bdaa29754c0f3ed040dd6d37bb1873b438d779a6f26080a23a25659a349405c28e4a05f0949c8472ed8d300 SHA512 8b1bf24888d06c487d4601bd31d5184070554ecd59923a3de482b4fcce6f5130c706f68d4b35d1545be4a1fbbd76ac36f3072df1c6f5e92c03d8ee3d566b72a3
diff --git a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild b/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
deleted file mode 100644
index 209586efc0a7..000000000000
--- a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/c/C}
-
-DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
-HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="Cenon"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=gnustep-libs/cenonlibrary-4.0.0"
-
-src_prepare() {
-	# Do not install files already provided by cenonlibrary
-	epatch "${FILESDIR}"/${P}-install.patch
-
-	epatch "${FILESDIR}"/${P}-check-return-value.patch
-	epatch "${FILESDIR}"/${P}-gnustep-gui-0.24-support.patch
-}
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch b/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch
deleted file mode 100644
index a23135b3230d..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Check the return value of `system'.
-Author: Yavor Doganov <yavor@gnu.org>
-Forwarded: yes
-Last-Update: 2014-06-25
----
-
---- cenon.app.orig/VHFImport/PSImport.m
-+++ cenon.app/VHFImport/PSImport.m
-@@ -143,7 +143,14 @@
- 
-     /* convert pdf to eps */
-     commandLine = [NSString stringWithFormat:@"%@ -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=epswrite -sOutputFile=%@ -c save pop -f '%@'", [self gsPath], psFile, pdfFile];
--    system([commandLine UTF8String]);
-+    if (system([commandLine UTF8String]) != 0)
-+      {
-+	NSRunAlertPanel(@"Unable to import file",
-+			@"An error occured while importing the file.\n"
-+			@"Make sure you have ghostscript installed in PATH.",
-+			@"OK", nil, nil);
-+	return nil;
-+      }
- 
-     /* import ps */
-     psData = [NSData dataWithContentsOfFile:psFile];
-@@ -330,7 +337,14 @@
-     //[data writeToFile:inFile atomically:NO];    // <= 10.4
- 
-     commandLine = [NSString stringWithFormat:@"%@ -dNODISPLAY -dBATCH -dNOSAFER -g1000x1000 '%@'", [self gsPath], inFile];
--    system([commandLine UTF8String]);
-+    if (system([commandLine UTF8String]) != 0)
-+      {
-+	NSRunAlertPanel(@"Unable to import file",
-+			@"An error occured while importing the file.\n"
-+			@"Make sure you have ghostscript installed in PATH.",
-+			@"OK", nil, nil);
-+	return nil;
-+      }
- 
-     /* load generated file */
-     //data = [[[NSString alloc] initWithContentsOfFile:outFile] autorelease];
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch b/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch
deleted file mode 100644
index b0799d835175..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-Description: Various fixes for gnustep-base/1.24 and gnustep-gui/0.24.
- - Proper intialization.
- - Use correct return types for methods and compare functions.
- - Likewise for method arguments.
- - Avoid conflicting methods by declaring the ivars of a specific type.
- - Add mising argument to private method declaration.
-Author: Yavor Doganov <yavor@gnu.org>
-Bug-Debian: http://bugs.debian.org/749553
-Forwarded: yes
-Last-Update: 2014-06-25
----
-
---- cenon.app.orig/GraphicObjects.subproj/VCurveFit.m
-+++ cenon.app/GraphicObjects.subproj/VCurveFit.m
-@@ -87,7 +87,7 @@
- /* turn lines into optimized curves
-  */
- - (VPath*)fitGraphic:(VGraphic*)g maxError:(double)maxError
--{   Point2  *pts = nil;
-+{   Point2  *pts = NULL;
-     int     i, nPts = 0;
-     VPath   *path = nil;
- 
---- cenon.app.orig/GraphicObjects.subproj/VGroup.h
-+++ cenon.app/GraphicObjects.subproj/VGroup.h
-@@ -67,7 +67,7 @@
- - (float)stepWidth;
- - (void)setRadialCenter:(NSPoint)rc;
- - (NSPoint)radialCenter;
--- (void)setList:(NSArray*)aList;
-+- (void)setList:(NSMutableArray*)aList;
- - (void)addObject:(VGraphic*)g;
- - (void)add:(NSArray*)addList;
- - (NSMutableArray*)list;
---- cenon.app.orig/InspectorPanel.subproj/IPAllAcc.h
-+++ cenon.app/InspectorPanel.subproj/IPAllAcc.h
-@@ -40,7 +40,7 @@
- 
- @interface IPAllAcc:IPBasicLevel
- {
--    id  accPopup;           // the popup to allow the user to select the different accessories
-+    NSPopUpButton *accPopup; // the popup to allow the user to select the different accessories
-     id  accView;            // the view containing the accessory view
- 
-     int levelCnt;           // number of accessories
---- cenon.app.orig/InspectorPanel.subproj/IPAllFilling.h
-+++ cenon.app/InspectorPanel.subproj/IPAllFilling.h
-@@ -39,7 +39,7 @@
-     id stepForm;
-     id colorWell;
-     id colorWellGraduated;
--    id fillPopup;
-+    NSPopUpButton *fillPopup;
-     id sliderBox;
-     id radialCenterText;
-     id angleButtonLeft;
---- cenon.app.orig/InspectorPanel.subproj/IPAllStrokeWidth.h
-+++ cenon.app/InspectorPanel.subproj/IPAllStrokeWidth.h
-@@ -35,7 +35,7 @@
- @interface IPAllStrokeWidth:IPBasicLevel
- {
-     int		stroked;
--    id 		strokePopup;
-+    NSPopUpButton	*strokePopup;
-     id 		colorWell;
-     id 		widthField;
-     id 		widthSlider;
---- cenon.app.orig/LayerObject.h
-+++ cenon.app/LayerObject.h
-@@ -144,8 +144,8 @@
- - (void)setString:(NSString *)aString;
- - (NSString*)string;
- 
--- (void)setTag:(int)newTag;
--- (int)tag;
-+- (void)setTag:(NSInteger)newTag;
-+- (NSInteger)tag;
- 
- - (void)setColor:(NSColor *)aColor;
- - (NSColor *)color;
---- cenon.app.orig/LayerObject.m
-+++ cenon.app/LayerObject.m
-@@ -227,8 +227,8 @@
- - (void)setString:(NSString *)aString   { [string release]; string = [aString retain]; }
- - (NSString *)string                    { return string; }
- 
--- (void)setTag:(int)newTag              { tag = newTag; }
--- (int)tag                              { return tag; }
-+- (void)setTag:(NSInteger)newTag        { tag = newTag; }
-+- (NSInteger)tag                        { return tag; }
- 
- - (void)setColor:(NSColor *)aColor      { color=aColor; }
- - (NSColor *)color                      { return color; }
---- cenon.app.orig/GraphicObjects.subproj/VPath.h
-+++ cenon.app/GraphicObjects.subproj/VPath.h
-@@ -58,7 +58,7 @@
- - (NSMutableArray*)list;
- - (void)setList:aList;
- - (void)setList:aList optimize:(BOOL)optimize;
--- (unsigned)count;
-+- (NSUInteger)count;
- - (unsigned)countRecursive;
- - (void)getEndPoints:(NSPoint*)p1 :(NSPoint*)p2;
- - (int)selectedKnobIndex;
---- cenon.app.orig/GraphicObjects.subproj/VPath.m
-+++ cenon.app/GraphicObjects.subproj/VPath.m
-@@ -399,7 +399,7 @@
-     *p2 = [[list objectAtIndex:[list count]-1] pointWithNum:MAXINT]; 
- }
- 
--- (unsigned)count
-+- (NSUInteger)count
- {
-     return [list count];
- }
---- cenon.app.orig/InspectorPanel.subproj/IPImage.h
-+++ cenon.app/InspectorPanel.subproj/IPImage.h
-@@ -43,7 +43,7 @@
-     id	thumbSwitch;
-     id	nameField;
-     id	factorField;
--    id	compPopUp;
-+    NSPopUpButton *compPopUp;
- 
-     VGraphic	*graphic;	// the loaded graphic or the first of them if multiple
- }
---- cenon.app.orig/DINImportSub.m
-+++ cenon.app/DINImportSub.m
-@@ -46,7 +46,7 @@
- /* created: 2001-06-06
-  * performcance map is not used, because we set this later when the layers are added to the view!
-  */
--static NSInteger sortLayer(id l1, id l2, void *context)
-+static NSComparisonResult sortLayer(id l1, id l2, void *context)
- {   float       d1 = 0.0, d2 = 0.0;
-     VGraphic    *g0 = [[l1 list] objectAtIndex:0], *g1 = [[l2 list] objectAtIndex:0];
- 
---- cenon.app.orig/DocView.m
-+++ cenon.app/DocView.m
-@@ -994,7 +994,7 @@
- #define SORT_COL_LRUL 5
- #define SORT_ROW_URLL 6
- #define SORT_ROW_LRUL 7
--NSInteger sortPosition(id g1, id g2, void *context)
-+NSComparisonResult sortPosition(id g1, id g2, void *context)
- {   NSPoint	p1 = [g1 bounds].origin, p2 = [g2 bounds].origin;
-     int		sort = *(int*)context;
- 
---- cenon.app.orig/SVGImportSub.m
-+++ cenon.app/SVGImportSub.m
-@@ -112,7 +112,7 @@
- /* allocate a group object
-  * copy the objects in aList to the group, add the group to bList
-  */
--- (void)addGroupList:(NSArray*)aList toList:bList
-+- (void)addGroupList:(NSMutableArray*)aList toList:bList
- {   VGroup          *g = [VGroup group];
-     int             i;
-     NSMutableArray  *mutArray = [NSMutableArray array];
-@@ -136,7 +136,7 @@
-     [bList addObject:g];
- }
- 
--- (void)addGroupList:(NSArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix
-+- (void)addGroupList:(NSMutableArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix
- {   VGroup          *g = [VGroup group];
-     int             i;
-     NSMutableArray  *mutArray = [NSMutableArray array];
---- cenon.app.orig/MoveCell.h
-+++ cenon.app/MoveCell.h
-@@ -32,7 +32,7 @@
- 
- @interface MoveCell:NSCell
- {
--    int		tag;
-+    NSInteger		tag;
-     MoveMatrix 	*moveMatrix;
- 
-     float	ascender, descender, lineHeight;
-@@ -41,8 +41,8 @@
- - (void)setMatrix:(MoveMatrix *)anMatrix;
- - (void)setFont:(NSFont *)fontObj;
- 
--- (void)setTag:(int)anInt;
--- (int)tag;
-+- (void)setTag:(NSInteger)anInt;
-+- (NSInteger)tag;
- 
- - (BOOL)dependant;
- 
---- cenon.app.orig/MoveCell.m
-+++ cenon.app/MoveCell.m
-@@ -39,14 +39,14 @@
- 
- /* modified: 13.01.93
-  */
--- (void)setTag:(int)anInt
-+- (void)setTag:(NSInteger)anInt
- {
-     tag=anInt;
- }
- 
- /* modified: 13.01.93
-  */
--- (int)tag
-+- (NSInteger)tag
- {
-     return tag;
- }
---- cenon.app.orig/VHFImport/DXFImport.m
-+++ cenon.app/VHFImport/DXFImport.m
-@@ -86,7 +86,7 @@
- - (BOOL)getSolid:(NSScanner*)scanner :(NSPoint*)ps :(int*)pCnt;
- - (BOOL)getCircle:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle;
- - (BOOL)getArc:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle;
--- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment;
-+- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment :(NSString**)fontName;
- - (BOOL)get3DFace:(NSScanner*)scanner points:(V3Point*)pts color:(NSColor**)color;
- - (BOOL)getInsert:(NSScanner*)scanner :cList;
- - (void)updateBounds:(NSPoint)p;
---- cenon.app.orig/TileScrollView.h
-+++ cenon.app/TileScrollView.h
-@@ -36,7 +36,7 @@
- @interface TileScrollView:NSScrollView
- {
-     id		box;
--    id		resPopupListButton;
-+    NSPopUpButton *resPopupListButton;
-     id		document;
-     VFloat	oldScaleFactor;
- }
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch b/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
deleted file mode 100644
index 8a75db6ee13a..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
---- Cenon.orig/GNUmakefile.postamble	2013-04-23 18:18:19.231871028 +0200
-+++ Cenon/GNUmakefile.postamble	2013-04-23 18:19:31.482864370 +0200
-@@ -18,12 +18,12 @@
- # before-install::
- 
- # Things to do after installing
--after-install::
-+#after-install::
- 	# copy library
- 	#rm -R $(GNUSTEP_LIBRARY)/$(APP_NAME)
--	cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
-+	#cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
- 	# set permissions (rrr)
--	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
-+	#chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
- 	#chmod -R ugo+rX $(GNUSTEP_LIBRARY)/$(APP_NAME)
- 
- # Things to do before uninstalling
diff --git a/gnustep-apps/cenon/metadata.xml b/gnustep-apps/cenon/metadata.xml
deleted file mode 100644
index 82760064a1ed..000000000000
--- a/gnustep-apps/cenon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		Cenon is a graphical tool of a special kind. Build upon a
-		modular graphical core, Cenon offers a wide variety of
-		possibilities and applications.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/cynthiune-1.0.0 b/gnustep-apps/cynthiune-1.0.0
new file mode 100644
index 000000000000..4af59c8cb00a
--- /dev/null
+++ b/gnustep-apps/cynthiune-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=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 ) mad? ( virtual/pkgconfig ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Free software and romantic music player for GNUstep
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/cynthiune/
+IUSE=alsa ao flac mad modplug musepack oss timidity vorbis debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Cynthiune-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a6fd884fffbeeb60d5683dc5d26314d
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
deleted file mode 100644
index b203832d13a6..000000000000
--- a/gnustep-apps/cynthiune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Cynthiune-1.0.0.tar.gz 570554 BLAKE2B 84cf68622c75b3e2b978aef2d8e3ab1de582d58a3d0c9cd7fac47c30cde69e61a16016abcfe0290339648cda58e0600fc21dae3ce97d3d0ec07013af9cb1c366 SHA512 ae56a77a138b2f661ecedbbad89935c3e8ec44447b000b73985577ea28304d11bb957fe118ba844168e9c7a06a229e8b024a6bc6eb4199080d6e69b77a31b4b7
-EBUILD cynthiune-1.0.0.ebuild 1702 BLAKE2B ad1e73150726a8867f12ac347ba455a0f83ea0181856f10bd8954658b77edf577218ea54efa31c1f071c227ee64792dccadb940f5734960b0b5edf07e201dfad SHA512 b991e8e64fa3a2c5906c47a6e50e9f49d1e13d002eb4cf7f4eeb77e7e379b93052f269f03b5d403a9e34e9e1e9743b1791857903fafbd06e84451c27bd25648d
-MISC metadata.xml 2309 BLAKE2B 2e481586c05f827797dbf4e4994dd6f4d17024ec9326090208fe8332efa0722ae6d6cde1e12658091ea8af1e032af7b15afd5d1c36a82336ffe4824dee510674 SHA512 ba9ac73bb2da9a4bb0935c3bad93a7ed9b78ef2ef1e43264e6c09558954c8a725ba3c1df88fec14fc0d7a2cb6a953d1aeb612b16edfdd4b1a7f14e42eb58c0a8
diff --git a/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild b/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild
deleted file mode 100644
index f6c3a25f513b..000000000000
--- a/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/c/C}
-DESCRIPTION="Free software and romantic music player for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/cynthiune/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="alsa ao flac mad modplug musepack oss timidity vorbis"
-
-# musicbrainz disabled upstream for now
-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 )"
-DEPEND="${RDEPEND}
-	mad? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-cynthiune_get_config() {
-	local myconf="disable-windowsmedia=yes disable-esound=yes"
-	use alsa || myconf="${myconf} disable-alsa=yes"
-	use ao || myconf="${myconf} disable-ao=yes"
-	use flac || myconf="${myconf} disable-flac=yes disable-flactags=yes"
-	use mad || myconf="${myconf} disable-mp3=yes disable-id3tag=yes"
-	use modplug || myconf="${myconf} disable-mod=yes"
-	use musepack || myconf="${myconf} disable-musepack=yes"
-	use oss || myconf="${myconf} disable-oss=yes"
-	use timidity || myconf="${myconf} disable-timidity=yes"
-	use vorbis || myconf="${myconf} disable-ogg=yes disable-vorbistags=yes"
-
-	echo ${myconf}
-}
-
-src_compile() {
-	egnustep_env
-	egnustep_make "$(cynthiune_get_config)"
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install "$(cynthiune_get_config)"
-}
diff --git a/gnustep-apps/cynthiune/metadata.xml b/gnustep-apps/cynthiune/metadata.xml
deleted file mode 100644
index 69269796fe98..000000000000
--- a/gnustep-apps/cynthiune/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Cynthiune (january 2004)
-=========
-
-What is Cynthiune?
-------------------
-Cynthiune is a free software and romantic music player for GNUstep and MacOSX.
-I wrote it originally as a christmas gift to a girl that I liked because she
-could not listen to music on her Mac with a free program. Since then, I decided
-to make it public and add even more features to make it a complete and useable
-media player.
-
-For the moment, it looks pretty much like XMMS, Winamp and similar software.
-Even though it has far less features than those, the essential components of a
-usable and user-friendly program are there in my opinion.
-
-From a programmatic point-of-view, I have decided to write a program that is
-released only when considered bug-free. The free software community lacks,
-IMnsHO, a sense of quality that makes its programs nearly useless to
-lambda users. Not only is it useless, but I think it also gives free software
-a bad reputation. The principle of freedom in "free software" is fundamental
-to me, but it has to be reachable not only by some sort of geeky elite. There
-is no point in telling users that since they have the freedom to enhance those
-programs, they must fix them if they want to use them. Releasing a program
-with too many bugs is of no use and is likely not to interest other fellow
-programmers in the community either.
-
-On the other hand, Apple has published an interesting program called "iTunes".
-Of course, it is not free software but it does implement interesting ideas
-that I would like to include in Cynthiune. For example: CD burning, complete
-playlist management, etc... Personally I find its user interface to be not as
-user-friendly as it could be. My plan is thus to take advantage of my own
-programming skills and sense of aesthetics (and ergonomy) to try to write
-something a little bit different, inspired both by XMMS/Winamp and iTunes.
-Cynthiune is thus currently very basic but its core design is starting to be
-extensible enough that it will not be too much trouble to enhance it.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/fisicalab-0.3.5 b/gnustep-apps/fisicalab-0.3.5
new file mode 100644
index 000000000000..839774b2841a
--- /dev/null
+++ b/gnustep-apps/fisicalab-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=educational application to solve physics problems
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/fisicalab
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://gnu/fisicalab/fisicalab-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a32c59f49fe286f275ec7b506c367fd4
diff --git a/gnustep-apps/fisicalab/Manifest b/gnustep-apps/fisicalab/Manifest
deleted file mode 100644
index ee7ba92603de..000000000000
--- a/gnustep-apps/fisicalab/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fisicalab-0.3.5.tar.gz 7801631 BLAKE2B a4c07f951620ade580dc788bb5380f400b95b71e69df87288836b8eb221b76998ec9214a23b2c75e39a46816deefa65a935b5196c9281008e1ac44924b29893b SHA512 03ac3f67c3597fda8418f6b5e7612c2b56cd90a5afd12834e57934a0a453f7afd7488ba0476af576275a3e2663389d4b18de590bfc954d2ca38af6c31cbd790b
-EBUILD fisicalab-0.3.5.ebuild 427 BLAKE2B faf3f097b9af0fffc34bbff3a2bdf55fa6f08e4eda4da764f7554154554cc01695093d6c4b7c4bbbf903f0d39c308fdbd7f134e9ec9e472978b74b438ea41085 SHA512 a8f79795683efa8658fb816f8ad43bf9e89d1e3b01eacab78cd43d94cc386ed3e57c9ba1ba5ca9863e54e14b233ef1dd5889dfc53e707eb931c201cca28d952f
-MISC metadata.xml 693 BLAKE2B 5ea95708724d1f1e309d490f489294c0e6c2525d8bd94c1e9d832c31d64709bdf48069af4941019027bd31674b0544b89ba9a686cc3596af9b49dc2035ac76ac SHA512 eb4ed444758c79796bd963843fb4db345ff1587ec955195267b1dadb6c313fa988e6c50bd02595c6773e7c7b901290ca6bd3d9cebb5e805458cbf2130efe8df2
diff --git a/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild b/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild
deleted file mode 100644
index 55e2cefb11c7..000000000000
--- a/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="educational application to solve physics problems"
-HOMEPAGE="https://www.gnu.org/software/fisicalab"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sci-libs/gsl-1.10
-	>=virtual/gnustep-back-0.16.0"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/fisicalab/metadata.xml b/gnustep-apps/fisicalab/metadata.xml
deleted file mode 100644
index d204a0226edc..000000000000
--- a/gnustep-apps/fisicalab/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>FísicaLab is an educational application to solve physics problems. Is made with GNUstep and use the GSL libraries (GNU Scientific Library). The problems are setting adding elements from the palette to chalkboard, and writing the data of each element. The elements are objects as Blocks, Pulleys, Mobiles, Forces, ... . Use the SI and English systems, scientific notation and many conversion factors</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/ftp-0.5 b/gnustep-apps/ftp-0.5
new file mode 100644
index 000000000000..88d1f2eda6af
--- /dev/null
+++ b/gnustep-apps/ftp-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=FTP client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/ftp/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/gnustep-apps/ftp-0.6 b/gnustep-apps/ftp-0.6
new file mode 100644
index 000000000000..60712777d118
--- /dev/null
+++ b/gnustep-apps/ftp-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=FTP client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/ftp/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/gnustep-apps/ftp/Manifest b/gnustep-apps/ftp/Manifest
deleted file mode 100644
index 13865d9aa104..000000000000
--- a/gnustep-apps/ftp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST FTP-0.5.tar.gz 132587 BLAKE2B cf564c0780abae841ea9ac8774841955429b688e8e4150391996d4d72051a8be9e14d8533d21a238f1b4a50c9bdf17cc717a9788a7b1514d30a1e2a3bf0f4037 SHA512 186ea229d15d06f43410bfb7eaa5d50548f908f1675a0beae54dcbc9f7adeb62384ab68fee8980df582d0c257721fb3a56ea4968ecdc91c3301172d82d61bee7
-DIST FTP-0.6.tar.gz 161962 BLAKE2B c2a121455589ee76c78df171a9f099737bd006da9775d0edd7c5c9643de79300a720a8cccde7b2ed835b73e3d78079b3c9a8932af52636a0f957d8461ab881ce SHA512 c717a7163b98b00c20aa06ab9acc5f3abca0e2b035a3ad801d5339bc80ad54cd86f1e52c1a28f0d7fb931bf70f0565073c20f9ba5e129cb7514cf0a153ec16a4
-EBUILD ftp-0.5.ebuild 403 BLAKE2B 2154a6fe8a5903171decb86b5cb04f4e450cf426133adb5aef9ee96107a26c0597dcba3a649555f6aa1582c5c59f063f8f1a0acdd69c0fff906a6f7376dba120 SHA512 f1c7285ba5ed3da2c52516a815ac9a13701472b40a28296c3aacd51707528f24a9c7dbfaac868d6634743f43ea53860e756678ad88cc7ba2299e6c70b202fe97
-EBUILD ftp-0.6.ebuild 403 BLAKE2B 2154a6fe8a5903171decb86b5cb04f4e450cf426133adb5aef9ee96107a26c0597dcba3a649555f6aa1582c5c59f063f8f1a0acdd69c0fff906a6f7376dba120 SHA512 f1c7285ba5ed3da2c52516a815ac9a13701472b40a28296c3aacd51707528f24a9c7dbfaac868d6634743f43ea53860e756678ad88cc7ba2299e6c70b202fe97
-MISC metadata.xml 758 BLAKE2B 52bdc4e1bd89a9a1398413c25c48f10c573ad401789a26a1fe7494a6f56d3db9570fa8975100dd8e351b97696fdc03bcab04cf9f095769a6e60223629bbf788b SHA512 b002ee5e922f16c67876213e29a5009d67db75f5af1ed5cd847a4db1bf9b288768ec1d2ea786d941d8b4528d4faa2d256767666f4d857a1a3910b8bdf01da951
diff --git a/gnustep-apps/ftp/ftp-0.5.ebuild b/gnustep-apps/ftp/ftp-0.5.ebuild
deleted file mode 100644
index df4e52448d48..000000000000
--- a/gnustep-apps/ftp/ftp-0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="FTP-${PV}"
-
-DESCRIPTION="FTP client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/ftp/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/ftp/ftp-0.6.ebuild b/gnustep-apps/ftp/ftp-0.6.ebuild
deleted file mode 100644
index df4e52448d48..000000000000
--- a/gnustep-apps/ftp/ftp-0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="FTP-${PV}"
-
-DESCRIPTION="FTP client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/ftp/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/ftp/metadata.xml b/gnustep-apps/ftp/metadata.xml
deleted file mode 100644
index 8c1fd1a8d59e..000000000000
--- a/gnustep-apps/ftp/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>FTP is a file transfer application (RFC 765) featuring a compact and easy interface. As most applications in GAP it tries to work on both GNUstep and MacOS X and retain the utmost possible simlilarity among the two version to ease working in both environments.
-
-Two panes manage local (left) and remote (right) resources.
-Transfer of single files as well as multiple selection is possible, recursive upload (directories and sub-directories) is performed transparently.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gemas-0.4 b/gnustep-apps/gemas-0.4
new file mode 100644
index 000000000000..6787e5e30a41
--- /dev/null
+++ b/gnustep-apps/gemas-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=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
+DESCRIPTION=a simple code editor for GNUstep
+EAPI=5
+HOMEPAGE=http://wiki.gnustep.org/index.php/Gemas.app
+IUSE=projectcenter debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/Gemas-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ee4a1abbf166b0530b299704516a9b06
diff --git a/gnustep-apps/gemas/Manifest b/gnustep-apps/gemas/Manifest
deleted file mode 100644
index ba5dc8194497..000000000000
--- a/gnustep-apps/gemas/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gemas-0.4-bundle_makefile.patch 1171 BLAKE2B b6a4e93248b4891a7940f03e36ba6bf88bc47c57b42f7428dcc90d35b3c2ce8b17ecf74f2a58b85b22c43e4677bff010216bb6d7d689215cad2652e174fdb96a SHA512 0d53cf299be329b227152326c3e7e61dbbddfcbe3635a42a5e925a963aa3270d33fc42d9f8758824405bb3520128d4d521bbd4ed50f72d5f5945c565bce42638
-DIST Gemas-0.4.tar.gz 552558 BLAKE2B 0bc3c2ca5a54fd1af5e85816174473910743d0fd045934ccee170f6c13933cd9059fbe9d25040c3dbeeb91325a7c2573663929d7bb984735c2d68f059c665681 SHA512 6ae1acadd1be71362d93ac44498b789d160146f02c995280a003ac748c4d5dde615854014351c560e4e49576c20094dce0c4e2bef0c8096368c0c25679670e58
-EBUILD gemas-0.4.ebuild 911 BLAKE2B 85fa5a0737321e8cc4e4f2ca8d2e97c0fdbea27f2e3bd246eb84be0c7b0e211762799d8736a21e3ef82a52d42fc28e4bbd8d706242b6ee30e1a451a3efdf8f86 SHA512 5cceb8ba7319311bd3b42a6b7acb92f13fccee476898ae67dd886f73153df4bed3dc45213d4c1ceac0110be26fcc162cb01e3c8a97201a3e862fc03dade4083c
-MISC metadata.xml 650 BLAKE2B 2db84c12e3501cbb95af1f6d968aac83337414888094d4989b717eeaf39feddc9de9591c42a340fab70aa733ee60bc6c08e5dc5eaab07c249f3413e94d32f3c8 SHA512 a947ebcee4024d140b0aeb972cbd69b9fc13bb842fdf9866a660240b0914cbe7049c778929749735eabba0cc4a03fdf69aa65a9f324d4ec0386d33c73a1b4e9a
diff --git a/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch b/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch
deleted file mode 100644
index 73595f256b56..000000000000
--- a/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur Gemas-0.4.orig/Bundle/Gemas/GNUmakefile Gemas-0.4/Bundle/Gemas/GNUmakefile
---- Gemas-0.4.orig/Bundle/Gemas/GNUmakefile	2013-12-24 18:51:16.000000000 +0100
-+++ Gemas-0.4/Bundle/Gemas/GNUmakefile	2014-02-10 10:50:45.331011111 +0100
-@@ -10,7 +10,7 @@
- BUNDLE_NAME = Gemas
- BUNDLE_EXTENSION = .editor
- Gemas_PRINCIPAL_CLASS = GemasEditor
--Gemas_INSTALL_DIR=$(GNUSTEP_LOCAL_APPS)/ProjectCenter.app/Resources
-+Gemas_INSTALL_DIR=${DESTDIR}/$(GNUSTEP_SYSTEM_APPS)/ProjectCenter.app/Resources
- 
- #
- # Additional libraries
-diff -Naur Gemas-0.4.orig/Bundle/Gemas/GNUmakefile.preamble Gemas-0.4/Bundle/Gemas/GNUmakefile.preamble
---- Gemas-0.4.orig/Bundle/Gemas/GNUmakefile.preamble	2013-12-24 18:51:16.000000000 +0100
-+++ Gemas-0.4/Bundle/Gemas/GNUmakefile.preamble	2014-02-10 10:50:50.622016109 +0100
-@@ -15,7 +15,7 @@
- ADDITIONAL_LDFLAGS +=
- 
- # Additional include directories the compiler should search
--ADDITIONAL_INCLUDE_DIRS +=-I$(GNUSTEP_LOCAL_HEADERS)/ProjectCenter
-+ADDITIONAL_INCLUDE_DIRS +=-I$(GNUSTEP_SYSTEM_HEADERS)/ProjectCenter
- 
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L./HighlighterKit/HighlighterKit.framework
diff --git a/gnustep-apps/gemas/gemas-0.4.ebuild b/gnustep-apps/gemas/gemas-0.4.ebuild
deleted file mode 100644
index 2fdf624eafe8..000000000000
--- a/gnustep-apps/gemas/gemas-0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-MY_P=${P/g/G}
-DESCRIPTION="a simple code editor for GNUstep"
-HOMEPAGE="http://wiki.gnustep.org/index.php/Gemas.app"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="projectcenter"
-
-DEPEND=">=gnustep-libs/highlighterkit-0.1.2
-	>=virtual/gnustep-back-0.22.0
-	projectcenter? ( gnustep-apps/projectcenter )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-bundle_makefile.patch
-}
-
-src_compile() {
-	gnustep-base_src_compile
-	if use projectcenter;
-	then
-		cd Bundle/Gemas || die "compile cd failed"
-		egnustep_make
-	fi
-}
-
-src_install() {
-	gnustep-base_src_install
-	if use projectcenter;
-	then
-		cd Bundle/Gemas || die "install cd failed"
-		egnustep_install
-	fi
-}
diff --git a/gnustep-apps/gemas/metadata.xml b/gnustep-apps/gemas/metadata.xml
deleted file mode 100644
index 3567c784835a..000000000000
--- a/gnustep-apps/gemas/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Gemas is a simple code editor for GNUstep. It have autoindentation and highlight syntax for C, C++, Objective-C, Objective-C++, GSmarkup. And to edit Strings, Plist, GNUmakefile, ChangeLog files and plain text files (INSTALL, README, ...)</longdescription>
-	<use>
-		<flag name="projectcenter">Build and install plugin for <pkg>gnustep-apps/projectcenter</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnustep-apps/gmines-0.2 b/gnustep-apps/gmines-0.2
new file mode 100644
index 000000000000..1af504e4a916
--- /dev/null
+++ b/gnustep-apps/gmines-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The well-known minesweeper game
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/gmines/index.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2d66800d38d7166b021f57342d59f291
diff --git a/gnustep-apps/gmines/Manifest b/gnustep-apps/gmines/Manifest
deleted file mode 100644
index a41c50985301..000000000000
--- a/gnustep-apps/gmines/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GMines-0.2.tar.gz 6768 BLAKE2B 7ff0abddef4d56245b35105d387e0994b2c4ed1c52fec5bd2166fced92153779f5cbd7e7f0b5e0e63f00463662719880db83a50d00c94b3221ef5435d7c4bcaf SHA512 592facdfb5db04418d79404ea2e6908fb7b7d67c4c55ab62e157bc18a7c69f3a5653bf2579257c56f91858f96785c424df7edcb8036c603fc1fb0740e68dd764
-EBUILD gmines-0.2.ebuild 393 BLAKE2B fc2bc2bc77b0b277e652c10d6696f0bb5baf0d15b32f68876f29aa95c849295f46d5805736fd9d1dbcf3dc5f3bab32bb8233158cde56e257a564d55144e0fa96 SHA512 f1a4acdf838c8dedaf850660c1bd6a3e12624ee0553ecf82c5ac0a541301ff3847d08b768e018196072337d8647f97c06428c878334cee9db2d947be0f7dfff4
-MISC metadata.xml 421 BLAKE2B 1bc3a8e001ac097510721f0927bb1779c61a8498508b8265838fba9106c33d2bb88e3da388a14b0b70e4c4ef76e31f789e3282a07dce0a71d2c87d60a3385b47 SHA512 f27f202c480fdcb3dfc9bbf082f35404c4f25baf6cbaa195f04f7a4934c77cb27d83740ae8bcf14cab86f1412aa0dcbf48af87afc0ccfe868acc8922f45ae408
diff --git a/gnustep-apps/gmines/gmines-0.2.ebuild b/gnustep-apps/gmines/gmines-0.2.ebuild
deleted file mode 100644
index 48ad1518b2cc..000000000000
--- a/gnustep-apps/gmines/gmines-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="The well-known minesweeper game"
-HOMEPAGE="http://gap.nongnu.org/gmines/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-S=${WORKDIR}/${P/gm/GM}
diff --git a/gnustep-apps/gmines/metadata.xml b/gnustep-apps/gmines/metadata.xml
deleted file mode 100644
index e6557ded2ad0..000000000000
--- a/gnustep-apps/gmines/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-The well-known minesweeper game.
-Left-click to uncover, right-click to mark.
-
-The look is inspired by the KDE minesweeper program.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gnumail-1.2.2 b/gnustep-apps/gnumail-1.2.2
new file mode 100644
index 000000000000..121f33285166
--- /dev/null
+++ b/gnustep-apps/gnumail-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.11.0 =gnustep-libs/pantomime-1.2* gnustep-apps/addresses >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A fully featured mail application for GNUstep
+EAPI=5
+HOMEPAGE=http://www.collaboration-world.com/gnumail/
+IUSE=crypt debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/GNUMail-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b3a3ac1df06a2e5b2df68a93006e50ca
diff --git a/gnustep-apps/gnumail-1.2.3 b/gnustep-apps/gnumail-1.2.3
new file mode 100644
index 000000000000..876763931266
--- /dev/null
+++ b/gnustep-apps/gnumail-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.11.0 =gnustep-libs/pantomime-1.2* gnustep-apps/addresses >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A fully featured mail application for GNUstep
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html
+IUSE=crypt debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fc96644ee580b395b6da7aa15a93d7ed
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
deleted file mode 100644
index 586b22ea7d4c..000000000000
--- a/gnustep-apps/gnumail/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST GNUMail-1.2.2.tar.gz 1397764 BLAKE2B 8b913d31d93d8bdbd186ecb50530926ccfec4917b3f4bd1ed9c70b86a97110cb1bae620cb24d9f8e1dbcebb652dbf1d30847cf8fdbc68a5ed0b1ede214440c57 SHA512 3243c51eb177c1fabeeb894e6231e5ace09fb08fd0eb9d6311726bdebddc743e3b3958b4c00597e7eb97de7c2a25f1ca7e8f4111e7d543ecd65ee5f35bea89cc
-DIST GNUMail-1.2.3.tar.gz 1411658 BLAKE2B 25feddbe4cb18305421488d3452093b5ef9dd04d4742b06c9260cd5428befa2643af8c34d402ecbcbeed20866adaf3a11c927b7d4aaa141869259799f5b39633 SHA512 5ee9b134b16c9aa8a7a0d4aff1e9d12a8c8d4f1f68c54d58cc354c3444a57a4c0bb31393886589ef83ae588789f00fd6e1313d01eb1f950af6623cc9ee42e598
-EBUILD gnumail-1.2.2.ebuild 871 BLAKE2B 008b8b151e29b919429ba412804c2b2992daecdb83248d6b78390831d7ac446e6e4ae9c13d9f1a90d8663f022ec3f29028769a0fa2d290ad3cad4f590b1ef496 SHA512 5916e7e39f0600389dba2bf50510481ad1b9918a0925889cc3b552c7ea4853a97d4a0110516b71754cea6a5d4c6f0462b3e8722315b90fb57488035d2da6d491
-EBUILD gnumail-1.2.3.ebuild 736 BLAKE2B bde78c8b048ee40c66dd9d01e67895c99974ee4a53c7feeca36e4742a09223606eeaf1338ccc5e08ea6eb1e7608ee4518cddcd3b860be6b00d687718aa3dcbe9 SHA512 afe73dc6225e3b370dc5f7543bd8a942d2cf69de795113cdc3d63e817a6e8934e5b4d94a7b996a322bec622f8c71f43f0a0790fceaee84bf9ac675c693d273e4
-MISC metadata.xml 713 BLAKE2B b7dcad7f57d6ee2d2c8fd3d1fd581d8bf33f11efcebc41514c528f1694d3ead9f086e2ece07fe660696055a41f6c22cf6c06271cdedd7b16802dd6d737784243 SHA512 3abb024b255072dc2ec848d6d356d41ad131be58fbcf68a7cfd2cbd5c21842c2c0c237b84c69519720faf0ff9ac300e8753abfcfe983122a6c617c74e41f24e2
diff --git a/gnustep-apps/gnumail/gnumail-1.2.2.ebuild b/gnustep-apps/gnumail/gnumail-1.2.2.ebuild
deleted file mode 100644
index 66e106bd9472..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/gnum/GNUM}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt"
-DEPEND=">=gnustep-base/gnustep-gui-0.11.0
-	=gnustep-libs/pantomime-1.2*
-	gnustep-apps/addresses"
-RDEPEND="crypt? ( app-crypt/gnupg )"
-
-src_prepare() {
-	sed -i -e 's|GNUMail_GUI_LIBS =|LIBRARIES_DEPEND_UPON +=|' \
-		Framework/GNUMail/GNUmakefile || die "as-needed sed failed"
-	use crypt || sed -i -e 's|Bundles/PGP||' \
-		GNUmakefile || die "PGP bundle sed failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc "${S}"/Documentation/*
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.3.ebuild b/gnustep-apps/gnumail/gnumail-1.2.3.ebuild
deleted file mode 100644
index 5cfe2b71f6c0..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${P/gnum/GNUM}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html"
-SRC_URI="mirror://nongnu/gnustep-nonfsf/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt"
-DEPEND=">=gnustep-base/gnustep-gui-0.11.0
-	=gnustep-libs/pantomime-1.2*
-	gnustep-apps/addresses"
-RDEPEND="crypt? ( app-crypt/gnupg )"
-
-src_prepare() {
-	use crypt || sed -i -e 's|Bundles/PGP||' GNUmakefile || die
-
-	default
-}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc "${S}"/Documentation/*
-}
diff --git a/gnustep-apps/gnumail/metadata.xml b/gnustep-apps/gnumail/metadata.xml
deleted file mode 100644
index f9a3efbf8402..000000000000
--- a/gnustep-apps/gnumail/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-GNUMail.app is a fully featured mail application running on Linux (or FreeBSD, OpenBSD, etc) and Apple Mac OS X. It uses the GNUstep development framework or Apple Cocoa, which is based on the OpenStep specification provided by NeXT, Inc.. GNUMail.app is licensed under the GPL, and the full sources of the application are available.
-
-GNUMail.app was written from scratch. It uses Pantomime as its mail handling framework.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gorm-1.2.23 b/gnustep-apps/gorm-1.2.23
new file mode 100644
index 000000000000..1e2a74453116
--- /dev/null
+++ b/gnustep-apps/gorm-1.2.23
@@ -0,0 +1,13 @@
+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
+DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/experience/Gorm.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.23.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5a18df5982715394cd0f5ba76d123268
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
deleted file mode 100644
index cbc65072ae62..000000000000
--- a/gnustep-apps/gorm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gorm-1.2.23.tar.gz 695799 BLAKE2B 93fcf72088a45c553fce4473a489719c84f02aa510e8da6fe4a1bbc80f1fab7d07ac07e05e6a543eaf5340246de4022b0be01fd0aaf48ac327aa52f723838074 SHA512 785ba83a82cee982c688a185300e90c9973b1c3de262770e708199593e7d8bfd9dccfa48ff6951f5d87558dffdda67c70fbc5091504afdd93e6e043d7b134460
-EBUILD gorm-1.2.23.ebuild 946 BLAKE2B 21dd8d7f40db8e0aee2c0a0e2d223fc5c1e0cf63370c66eeef233dc2868f4393172b6b01456a37cc26acdd565d240892c1cc7dd2ffcd048f11727301cc6205ca SHA512 d4cd8cb3f96ab5a9ed6df59643d0c0a204b524578f31eb27d58a29c978254357d2b62b5075b702e048c79194d7712cfccabbf46caca00cb92ccfc982c281545a
-MISC metadata.xml 1582 BLAKE2B f74b9e184307e63211c44930296a121dd4ce21db01ed4f5c2516dee219fbd579f846a28fbbc9508ed68348e1ad0a8bed65b5ab8b8c748393afbfe82f00e22296 SHA512 11e7fac87e8f54b612ad19237f4229e319f22ea8530dbd18fc3be6cce63b2653df2f1d1bd06786288d5dd1453cbc483e1fe98a280145a2c44f702b364870e2af
diff --git a/gnustep-apps/gorm/gorm-1.2.23.ebuild b/gnustep-apps/gorm/gorm-1.2.23.ebuild
deleted file mode 100644
index 314d0c3c5616..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.23.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		Documentation/GNUmakefile
-
-	default
-}
diff --git a/gnustep-apps/gorm/metadata.xml b/gnustep-apps/gorm/metadata.xml
deleted file mode 100644
index b0615dd9070a..000000000000
--- a/gnustep-apps/gorm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>
-Before NeXT Computer Inc. revolutionized software developement with its OpenStep API, a new way of designing graphical user interfaces was already introduced by NeXT at the beginning of the 90s. Its operating system NeXTstep featured Interface Builder, an application that for the first time allowed developers to quickly create nice user interfaces without having to code everything manually. Using drag and drop elements of windows such as buttons, sliders, textfields etc were created abd edited, then linked to functions and variables. Thus, Interface Builder helped developers to focus on the code for the actual functions without having to care about stuff not related to their project goal.
-
-As part of the GNUstep project, Gorm is meant to be the counter part to NeXT's Interface Builder. With Gorm designing tough and complex graphical interfaces for your applications can easy and quickly be done using drag and drop, powerful inspectors and teamwork with ProjectCenter.
-
-Gorm allows developers to quickly create and edit graphical application interfaces using a whole lot of GUI elements: windows, menus, buttons, labels, sliders, tables, textfields, browsers, images, altert panels and more. Custom palettes can be dynamically loaded to add additional elements or functionality.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/graphos-0.6 b/gnustep-apps/graphos-0.6
new file mode 100644
index 000000000000..55bd92e954d5
--- /dev/null
+++ b/gnustep-apps/graphos-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=vector drawing application centered around bezier paths
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/graphos/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Graphos-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4225d8045095ce8ce9a95c28155785cb
diff --git a/gnustep-apps/graphos/Manifest b/gnustep-apps/graphos/Manifest
deleted file mode 100644
index 947747136f9f..000000000000
--- a/gnustep-apps/graphos/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Graphos-0.6.tar.gz 140416 BLAKE2B faee3825e0f8c8c627cefd40e953bb5dccc9302423f788088504d518e5c1ad72153210d1250b8d662680badcaf8ad91cf9048b880dd6779f0873ecd42f21e8a7 SHA512 2bf108ef1fb7ff4d2bf3c1a11766704a35986bd629f879f417eaff4b214f8dd50b2319f8f6739a2f589a8eaf8ac334a55365868d0bb001adcbc0bf1ecf30c2b9
-EBUILD graphos-0.6.ebuild 427 BLAKE2B 7041c0bb2046a1f942531c9e5e4a3515f27f31343ee9bdb195d868418b2b34987b836649592fac61aa6be89f58cf0e33ba4721c92bbe7b057798882c09dc3433 SHA512 565a6a5f67452734a14a0f12dec7bc93af832af2a3945e227714fcb2837787e32ed53d0297d194ff38946371aa38a4b9d209cc13ec187dfeb290017ed3668c3a
-MISC metadata.xml 452 BLAKE2B b002b7fbd67ef39e8ecc0611173a0cd6ff462a66132baca5077b70ce52282ef6b6e1e35e9f4cad6fe507a7aa97491a5936df505074f9b0e20236ed41cd46d02b SHA512 1af68cee22cd39525cc5ccff6070f72f80a714d867e4929bce9c55093eb5a07ef4b6427e088dc0fc83c242caa01889b2c53ba63bc66b11f67620665d8962ce01
diff --git a/gnustep-apps/graphos/graphos-0.6.ebuild b/gnustep-apps/graphos/graphos-0.6.ebuild
deleted file mode 100644
index 4ad643355eba..000000000000
--- a/gnustep-apps/graphos/graphos-0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN/g/G}-${PV}
-DESCRIPTION="vector drawing application centered around bezier paths"
-HOMEPAGE="http://gap.nongnu.org/graphos/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/graphos/metadata.xml b/gnustep-apps/graphos/metadata.xml
deleted file mode 100644
index cffc647177ec..000000000000
--- a/gnustep-apps/graphos/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Graphos is a vector drawing application centered around bezier paths. Graphos roots are directly set in GDraw, written by Enrico Sersale and released in 2000.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gshisen-1.3.0-r1 b/gnustep-apps/gshisen-1.3.0-r1
new file mode 100644
index 000000000000..daf344ecfa17
--- /dev/null
+++ b/gnustep-apps/gshisen-1.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The first GNUstep game, similar to Mahjongg
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/gshisen/index.html
+IUSE=debug doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GShisen-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1427d204f922e458539223d7ca95d840
diff --git a/gnustep-apps/gshisen/Manifest b/gnustep-apps/gshisen/Manifest
deleted file mode 100644
index fa2f2cb19133..000000000000
--- a/gnustep-apps/gshisen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GShisen-1.3.0.tar.gz 66406 BLAKE2B 454360526433fc3922cd7f1370252991d1d92ef6966f0058a5046b72bd17d89f3455f5d1630b79d35cc42671ede12fafbdabc38d386870c423d41e364ef900a6 SHA512 eaaf4705837c59ec4bb67f183a595f100d95e892d47cb666510228d99e5ebc4551b494f7993d3d134bd9def947bb9255742cd1127abc1995e493ca50707cd4fd
-EBUILD gshisen-1.3.0-r1.ebuild 415 BLAKE2B 23deeae86659888e5b2c14f7e3cabbeefdefe04ef5998427a6734724da7b8d33c6b91c3e19eac5b30462b514c430ba7278b71bdadf1b718ca53493a3292de27e SHA512 abc26df23aa07458ef4bb098549e212fe233e7dac2c17acd95cf4482e643180cba5f19c222946cc6f7c4329c1a355c55c0b09aef18944f583261a65513424c51
-MISC metadata.xml 720 BLAKE2B 78b28da76021e5820e128fd0d523ad33445d47009e0b6edff2d9f89c0398376eb7b182e3e0ba6af5e5113272eb4671c16ac17303d2febfd611246d4ba6763e5d SHA512 9334ac77d8f7bffb66fe3d6fb860f8d5936e15f68cb184b393f7374419e78b530305058058f2f696530bc20d473acc8eb11a281c28bd0cec6e0bf45c59c8d14b
diff --git a/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild b/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
deleted file mode 100644
index c0fa51d3b218..000000000000
--- a/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_PN=GShisen
-DESCRIPTION="The first GNUstep game, similar to Mahjongg"
-HOMEPAGE="http://gap.nongnu.org/gshisen/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/gshisen/metadata.xml b/gnustep-apps/gshisen/metadata.xml
deleted file mode 100644
index e345ab2a273f..000000000000
--- a/gnustep-apps/gshisen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>GShisen is the first GNUstep game!
-The object of the game is to remove all tiles from the field. Only two matching tiles can be removed at a time. Two tiles can only be removed if they can be connected with at most three connected lines. Lines can be horizontal or vertical but not diagonal.
-Remember that lines may cross the empty border. If you are stuck, you can use the Hint feature to find two tiles which may be removed.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gspdf-0.5 b/gnustep-apps/gspdf-0.5
new file mode 100644
index 000000000000..15cd114eda10
--- /dev/null
+++ b/gnustep-apps/gspdf-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Postscript and Pdf Viewer using GhostScript
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/gspdf/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GSPdf-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=746179c6241cd084aa4154ed2c4e78ba
diff --git a/gnustep-apps/gspdf/Manifest b/gnustep-apps/gspdf/Manifest
deleted file mode 100644
index 216e897a4154..000000000000
--- a/gnustep-apps/gspdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GSPdf-0.5.tar.gz 44357 BLAKE2B d0c49fac60281c2d6dfa16f70b34cc31bafc265dd8bde064fd2311499388f3990aefbe1fcaa8f9056336450d31f70cd77e2e3e26795852a1a2cc201c5590607c SHA512 ad173c0301bb3d6395e52f911b4657ad8c69e989366035a50c05705c08dc5afd1561c4acfd1a0fea53b2a02842261351407c479919332c65545bde6a10744041
-EBUILD gspdf-0.5.ebuild 461 BLAKE2B deb8e8e805dd1659ffee5dfb350e7574a8ab34d513e07d40950b5c0df6a5cbc6f1ec988f3d1b64b30ac97ed7534637083958d14dadf744daa26b7d21e3c36894 SHA512 91c585d819fd37599da7011dc4198104c52a1b5621ae01b559793b47cd34bbe249de744cddaac0c82decb290cce3c1fd177d4d9f903b16842a424ba2d4ff5602
-MISC metadata.xml 413 BLAKE2B a70404defc045cb71cb9ef405dfe0031ba5a48f7a5ceaaf1ea1388d7631d492270646cc06a73df0b53c87e0ad5eb68dced9199e06de93df682da6b0985333512 SHA512 5038f7a95ddebf9bd2f2a862749603e5b12832573c0bf6770643a06178d5647cce20883f7b30ed15eda05016d5db9ebf8e1132fc3c441ccde57b3fbe9730f8c3
diff --git a/gnustep-apps/gspdf/gspdf-0.5.ebuild b/gnustep-apps/gspdf/gspdf-0.5.ebuild
deleted file mode 100644
index fdc73ac613c8..000000000000
--- a/gnustep-apps/gspdf/gspdf-0.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnustep-2
-
-MY_PN=GSPdf
-DESCRIPTION="Postscript and Pdf Viewer using GhostScript"
-HOMEPAGE="http://gap.nongnu.org/gspdf/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-text/ghostscript-gpl"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/gspdf/metadata.xml b/gnustep-apps/gspdf/metadata.xml
deleted file mode 100644
index 18684ed15ac5..000000000000
--- a/gnustep-apps/gspdf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>GSPdf is a Pdf and PostScript file viewer. It is based on GhostScript which it calls at runtime to rasterize the pages.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gworkspace-0.9.4 b/gnustep-apps/gworkspace-0.9.4
new file mode 100644
index 000000000000..959195024995
--- /dev/null
+++ b/gnustep-apps/gworkspace-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=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
+DESCRIPTION=A workspace manager for GNUstep
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/experience/GWorkspace.html
+IUSE=+gwmetadata debug doc
+KEYWORDS=amd64 ppc x86
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4d4d2d710f30c6c0282a56cda84f55e9
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
deleted file mode 100644
index dbf2103c7384..000000000000
--- a/gnustep-apps/gworkspace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gworkspace-0.9.4.tar.gz 3855909 BLAKE2B 5a636ccfb4fa79acd91bce34d3b5fe8a6d7bccc3f2f1f5a3d9f19c8a91743ec19c2eae0930e81807c6a5f098761b65f17e86a3edc44da155c50c903284ea2b20 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7
-EBUILD gworkspace-0.9.4.ebuild 877 BLAKE2B c7d08f264f2984e9a439332ae869d2d3a712d206139cd609f45d72c28d51ffad872746a1d82dba9aeb581b9f19d6b8268e79e6f2ab22a740465534dd63341a7d SHA512 b1b2fa6096b78e3dc1713da29966e720a37927d45766130a90be609112b973a1a57b74b9bb4089f7df9f56279be7a5a7de906fac5139efb38e95783251a8319e
-MISC metadata.xml 579 BLAKE2B 1cee2bbb6f86ab94b59b6e3169c7ffbdb927b9f84c1c62e5c7935fb9ba158768f4a6911d3c357c5a30741843069f69986ad89d3139c614e7fc87572c096ad58c SHA512 d369179dfa43f986b92e64b7d458a00925b0700de1fd8ae910e37312529519694293734464e993ca071cdc995832c2125837c2e28497b10a9a885a4ebff94b12
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild
deleted file mode 100644
index 72574db0a946..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.25.0
-	gwmetadata? (
-		>=gnustep-apps/systempreferences-1.0.1_p24791
-		>=dev-db/sqlite-3.2.8
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=""
-	use kernel_linux && myconf="${myconf} --with-inotify"
-	use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
-	egnustep_env
-	econf ${myconf}
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-
-	if use doc;
-	then
-		dodir /usr/share/doc/${PF}
-		cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
-	fi
-}
diff --git a/gnustep-apps/gworkspace/metadata.xml b/gnustep-apps/gworkspace/metadata.xml
deleted file mode 100644
index be6503de9155..000000000000
--- a/gnustep-apps/gworkspace/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-GWorkspace is the official GNUstep workspace manager. It is a clone of the NeXT workspace manager. GWorkspace is becoming more and more stable every day and it is already ready for daily usage.
-</longdescription>
-<use>
-	<flag name="gwmetadata">Enable the metadata indexing and searching system</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-apps/lapispuzzle-1.2 b/gnustep-apps/lapispuzzle-1.2
new file mode 100644
index 000000000000..99e6ba1451a6
--- /dev/null
+++ b/gnustep-apps/lapispuzzle-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a Tetris-like game where each player is effected by the others game play
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/lapispuzzle/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LapisPuzzle-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1991d2f8451ffb820a6dda7db52c3180
diff --git a/gnustep-apps/lapispuzzle/Manifest b/gnustep-apps/lapispuzzle/Manifest
deleted file mode 100644
index 4a677a8d1273..000000000000
--- a/gnustep-apps/lapispuzzle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LapisPuzzle-1.2.tar.gz 30188 BLAKE2B 75f5a0c0b748c7be91ac11fd1d3d6b6b44e46d3c446508cc8f54ac7d810b0427b7305868e5045b2e23b1b0f643c6aea9a9ba318d9651b473dcbc7c8c2b2a0b50 SHA512 d7fc846ad2e771a0adace983d4d6c07a71680ab8164e9ca459e2be44774df393602338d125a4c4dac8c8c0d8315a861118e4fa56c59139d964bba64aa7bb443b
-EBUILD lapispuzzle-1.2.ebuild 467 BLAKE2B e52b6a6e9d763cd2e47a4403fa1d6c74ae638074d397862cdab036ccf2215d7d96f5955bbc5b60625ff1b9254b993255f80b3bff50de2080870abc7645b7bf68 SHA512 e1f13f242bc8a270f360e1728c87d8b6329c8a3a52aa848580a13c9b724feb2f5268c12a8a6d846b3ff8d8f5559796eb12f300c3403e4825702d77bac4e721f6
-MISC metadata.xml 427 BLAKE2B b94984b58a33447d1a947a17df89b9112b87c425ba6a89ccd2a8c2f4f664c9e6b75100272ed9c4c94a24144f1e3616b07cad4824d3e496b791b9f9cd5150b116 SHA512 cd109c7f9cf95dc765849ae3780b977e5e7de40cfd909fc064e4bf29cf4ca50e3cfefd022861eaac65c79f31ad5f863b5c7d82255b5254373b459e8c343a1495
diff --git a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild b/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
deleted file mode 100644
index 628a8ba5a0bd..000000000000
--- a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=LapisPuzzle-${PV}
-
-DESCRIPTION="a Tetris-like game where each player is effected by the others game play"
-HOMEPAGE="http://gap.nongnu.org/lapispuzzle/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/lapispuzzle/metadata.xml b/gnustep-apps/lapispuzzle/metadata.xml
deleted file mode 100644
index c50272369ea0..000000000000
--- a/gnustep-apps/lapispuzzle/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a tetris-like game which challenges the player by making the opposing team's victories count doubly against the player and vice versa</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/laternamagica-0.4 b/gnustep-apps/laternamagica-0.4
new file mode 100644
index 000000000000..3425178fe0c1
--- /dev/null
+++ b/gnustep-apps/laternamagica-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=an image viewer and slideshow application
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=659b06e4d7922f8c59539f68a677ba91
diff --git a/gnustep-apps/laternamagica-0.5 b/gnustep-apps/laternamagica-0.5
new file mode 100644
index 000000000000..9f227aea9f78
--- /dev/null
+++ b/gnustep-apps/laternamagica-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=an image viewer and slideshow application
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7385cad54ddcb0b8043dad9e1ae4efc7
diff --git a/gnustep-apps/laternamagica/Manifest b/gnustep-apps/laternamagica/Manifest
deleted file mode 100644
index 48ffc0eec281..000000000000
--- a/gnustep-apps/laternamagica/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST LaternaMagica-0.4.tar.gz 127317 BLAKE2B facd517eeb6d271d9aed2dfa89db2d44488d12c39fa31b227847598e6e7127f33338929cd5318989b15127302db9c8891b9827f24c66c746a662c83bc0060603 SHA512 ba07abcd3a8f5e700fc1190bdc9664e34d2e26034ec6e2ac1688ed3e5b31659d9a59cbd1df9d4bea5a913e48c5c431a13e646a0be1b1b457e0ce8189d25eecef
-DIST LaternaMagica-0.5.tar.gz 124896 BLAKE2B 90db269b5b7e4e0810cd3c6d0341034d36fb154534d16d0e60dd9ec109a7e93cb1146c6ca434f6dae7fd1afb2fd123f7bc7c2922618c6c4e052b0a7b87178c26 SHA512 830ba5432a8c5f7e4ec15523d53ad16a3e2bf9502ac4324ecfcf71131f4fd0b562424e5b4990732f0841ab06ee668115b5ef2c1ff8066390a193d2f655d207ce
-EBUILD laternamagica-0.4.ebuild 420 BLAKE2B d8619e64b96d25809cd250aca68973564c1c2387a567efd35dcefe5ad80a75ceb34643721130c34989314dc764dfcb353d2b3318ae9901cd6b9ca69c5897d946 SHA512 927b67130f5881eb5078a93896a3cd7b9440a7e85ece86be2426cd1a845255c2503f3ed59dc5e848ce5f76ec307ecc11e3cfd8b786982b3d6de1cad145a802d7
-EBUILD laternamagica-0.5.ebuild 420 BLAKE2B faf285a749f2e7c2e0a075dedf3591767b202c863627d85aadffd730498f915a0e406ab59fddd8ce0369beaeea423bfdf6aa801ea0b57ecc372533f2809a719c SHA512 7e613400eca1203b9fa5e98445619ce9138c0bf35215bd862c494db17ab2407b1a8b3ca562620191edf1a1e0842eddcd102dc000dc83575888a95572472c64a2
-MISC metadata.xml 775 BLAKE2B af9fc6832c8c4487135fc6c88ddb004301f8bbec8724fd94d44b021d56e7e1ff6be3f59c00ec48c76fd1b7440029714c7e8361dccb79476291bb3c1fcc97170e SHA512 0c8640c874db01ddd4b2f4def0684e2e93f19d6f638925dca78c1d86f2149f6f1abfeff795bd5c0b6d678aaabda324ce1ba659b488bb2933797e6e5ecc7f4238
diff --git a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild b/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
deleted file mode 100644
index 73582ce66670..000000000000
--- a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P="LaternaMagica-${PV}"
-DESCRIPTION="an image viewer and slideshow application"
-HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild b/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
deleted file mode 100644
index 02e182c088b0..000000000000
--- a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="LaternaMagica-${PV}"
-DESCRIPTION="an image viewer and slideshow application"
-HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/laternamagica/metadata.xml b/gnustep-apps/laternamagica/metadata.xml
deleted file mode 100644
index a86c4ecf3822..000000000000
--- a/gnustep-apps/laternamagica/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>LaternaMagica is a single-window image viewer application which is capable of switching to full-screen mode.
-LaternaMagica maintains its image list in a window and the user selects which image to display, making it easy to assemble a show from different source directories.
-LaternaMagica can recurse into directories when looking for images to add and construct the list.
-LaternaMagica is capable of exporting the complete list to a folder by operating resizing and file conversion</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/metadata.xml b/gnustep-apps/metadata.xml
deleted file mode 100644
index 3f0a3a1a216b..000000000000
--- a/gnustep-apps/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnustep-apps category contains GNUstep applications.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnustep-apps enthält Applikationen für die
-		GNUstep-Umgebung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnustep-apps contiene aplicaciones de GNUstep.
-	</longdescription>
-	<longdescription lang="ja">
-		gnustep-appsカテゴリーにはGNUstepアプリケーションが含まれています
-	</longdescription>
-	<longdescription lang="nl">
-		De gnusteps-apps categorie bevat GNUstep applicaties.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnustep-apps chứa các ứng dụng GNUstep.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnustep-apps contiene applicazioni per GNUstep.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnustep-apps contém aplicações de GNUstep.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnustep-apps zawiera programy GNUstep.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnustep-apps/mpdcon-1.5.1 b/gnustep-apps/mpdcon-1.5.1
new file mode 100644
index 000000000000..810deb71133e
--- /dev/null
+++ b/gnustep-apps/mpdcon-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libbsd >=gnustep-libs/sqlclient-1.6.0[sqlite] >=media-libs/libmpdclient-2.7 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep client for the Music Player Daemon
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/mpdcon/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/MPDCon-1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b931308db9f02102cb957d9868f2b51f
diff --git a/gnustep-apps/mpdcon/Manifest b/gnustep-apps/mpdcon/Manifest
deleted file mode 100644
index ab1428a03bda..000000000000
--- a/gnustep-apps/mpdcon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MPDCon-1.5.1.tar.gz 90845 BLAKE2B 3b832ccbfbb67a08f0e5006aacb4cce5b20660855d1ca71baec57b24c66c6fa517dc64aa4b2640ea3f8a85806248bfdc8aeff28f0241bf83b42aebd30540287b SHA512 b47c6d603938ace1561fc01ef400a4f217035692eeb2552d59bc924ba20f3e67508a0e6da0e6805ef3ec67e19ba33a5028721ec9294a67419d9ce97c5d4ce6c1
-EBUILD mpdcon-1.5.1.ebuild 571 BLAKE2B c99ac90ba695ccb183dc14957173d92356f64e1c321f8d2ee5f5eaefff22f7b42f964151f2bd77e6abe70acd245aa987e09cbaaba6aa4b73e7948ab359ec9eda SHA512 85b5753eb8ce6c437bb00df6de2b999167e3c150379da59cb477268614d87e76f8182cebc7c7aa47e711663f9e221a61cb45440844a58ed3ce177f033c7b84de
-MISC metadata.xml 340 BLAKE2B 559b3221f234a7a57fb8cad261611b0dd1d1ff04bfcea28f60ba11d91e3e8648f31dd0e36027948efd48f868d995e19f8b8153bbee18557e9d8f50de7fad24bf SHA512 c470ed87528ea7f4174136e50a4805905a94f432b9d80025c1b0b161d31afba59be3733109ff197357e53b692430a802db6b4212e2a42d4b8a0bb6d9d188c67a
diff --git a/gnustep-apps/mpdcon/metadata.xml b/gnustep-apps/mpdcon/metadata.xml
deleted file mode 100644
index 45e2453cdb2c..000000000000
--- a/gnustep-apps/mpdcon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>MPDCon is a client for the Music Player Daemon</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild b/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild
deleted file mode 100644
index 3533c70c8edf..000000000000
--- a/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/mpdc/MPDC}
-DESCRIPTION="GNUstep client for the Music Player Daemon"
-HOMEPAGE="http://gap.nongnu.org/mpdcon/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="dev-libs/libbsd
-	>=gnustep-libs/sqlclient-1.6.0[sqlite]
-	>=media-libs/libmpdclient-2.7"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	egnustep_env
-	egnustep_make need-libbsd=yes
-}
diff --git a/gnustep-apps/pictureframe-1.1.3 b/gnustep-apps/pictureframe-1.1.3
new file mode 100644
index 000000000000..3f06320d70de
--- /dev/null
+++ b/gnustep-apps/pictureframe-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=digital picture frame software
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/gap/pictureframe/index.html
+IUSE=debug doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d1d87805fa286f650cbdfa992358c83f
diff --git a/gnustep-apps/pictureframe/Manifest b/gnustep-apps/pictureframe/Manifest
deleted file mode 100644
index f74ae4d7ff71..000000000000
--- a/gnustep-apps/pictureframe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PictureFrame-1.1.3.tar.gz 343981 BLAKE2B c9553d0c9b9fa4faabb6f06a26a26901189685954731b8529f14dfc938164335fdd0fd6d2508c4adc584156e276f4199e718b629645a8d8955297eacafe96496 SHA512 117dff1519ea21ea3a1b951cb1f1c03574abff14880056339035f29ebb0683fba921afcb28763a79d4aa8d1c28fd3b61aab385444e5fd80878a3088ef1a651b2
-EBUILD pictureframe-1.1.3.ebuild 492 BLAKE2B ab289d3dd11398b2cce54aa346de1678f4d65f364a0a0e50ef98e64e002014d306080015d5f8120f64410b53493e34301482ec4107d7d4a800369c5bedac6f39 SHA512 99b9a880071ad835b0f837376e6565a2d6ffb36149afa920a7616becfe8b24f647c0bb3e5ced59c613613adad0be5ab74289cc34971c2402eead5c472d223eb0
-MISC metadata.xml 324 BLAKE2B bcec5528819e2a35be937ed42f21abb1943f03f13b70dfdb953df6669fbea296dfc90961b54a448b98e31a32d42a5198b7ab227a67df77cb4f76e54e28053ddf SHA512 8bf9bf990b30a238dee402ec733007043eb569b1ec4bdd25b2fe4f3f77457fd6d9b8e79926d28067a00fd27ae1efb787d7d275275b6bd8ad5c4aecb1e07837d2
diff --git a/gnustep-apps/pictureframe/metadata.xml b/gnustep-apps/pictureframe/metadata.xml
deleted file mode 100644
index d605957681b1..000000000000
--- a/gnustep-apps/pictureframe/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>digital picture frame software</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild b/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild
deleted file mode 100644
index 4f5216ec06ec..000000000000
--- a/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_PN=PictureFrame
-DESCRIPTION="digital picture frame software"
-HOMEPAGE="http://www.nongnu.org/gap/pictureframe/index.html"
-SRC_URI="http://ftp.gnustep.org/pub/gnustep/contrib/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc PICTURE_FRAMES README
-}
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r1 b/gnustep-apps/pikopixel-1.0_beta9-r1
new file mode 100644
index 000000000000..d5cac73f338d
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9a.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99a1cb62ba6e917adb87e761dedfd737
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r2 b/gnustep-apps/pikopixel-1.0_beta9-r2
new file mode 100644
index 000000000000..e7fae3689eea
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9b.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e73155547a646600e7cc8dd60f391f49
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r3 b/gnustep-apps/pikopixel-1.0_beta9-r3
new file mode 100644
index 000000000000..c85f98ab8382
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9c.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=492fcbb59c5fe431343912117936177e
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
deleted file mode 100644
index a61442da4321..000000000000
--- a/gnustep-apps/pikopixel/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST PikoPixel.Sources.1.0-b9a.tar.gz 553753 BLAKE2B 18ab3159c29ba46850a7eee3d5bf45e63f0f2a66270b61141a13ff7fbdf8b9e988979388d608995fc9b8fc089ed2beeafe838db82e16756726422b2ce641bb4a SHA512 03cc3d6dccc26986aeac95074b6cac47d9d5c087c5b3e742409ec41297f634649bcfd4f2d76118e49c95499e1b75dab97e81951ae1186449707c8634ab1519fe
-DIST PikoPixel.Sources.1.0-b9b.tar.gz 566094 BLAKE2B 2f79eb77cbfa5508db600f908b25c2b1543c082364d83f734105b49ef5d0502cc89ac49fc8b08686cd1cee29faa4dcd59ed21372be8ec0fc1d100488f42bb918 SHA512 9579a3455ad77f85686bc01819aa2a008277dc2e8d0205dc0fe26743a150f7f5f4c8aed61eb32c9291fef65f3d1f07db2e560c24b084df53f0360fedd2fc5415
-DIST PikoPixel.Sources.1.0-b9c.tar.gz 566871 BLAKE2B 23b1213dcf553db58b65e2e3e3ad950a7fa55f0ffa288da7c5784bf42b3cdf0d280cc433e03e072dda05b2fd4c818fac28d8ea5e4697b80a40fc583dfb885794 SHA512 0fe4657303be5876229231d45ef8ddf8e04636a5e0137acacecedc634fc5bf52c5bbe3a4c901460cfe629fb545796e7ebf8badd9b19a09f642a77e0d8d17fc85
-EBUILD pikopixel-1.0_beta9-r1.ebuild 616 BLAKE2B 2540d1ebb0130f488ff4f9a59d1a6853c599bc7651e78d96ed7348e483809b3d33f027c709e491a5759ebacb268ea569845cc085e126f1308c6a3c92663156a7 SHA512 76320aced9fcf4267c029546a725289d0b9f4cc0dd354eaedb7e3a63f8f645555ac520c19865c3c041aedfb1f40751ee7446586ffe799dd3bc266620f469e36f
-EBUILD pikopixel-1.0_beta9-r2.ebuild 616 BLAKE2B 6f9c27545090a0fb8a06345a96bde7576b2a0e01f7fdcbf2662034016ba53365e00c0664265f2bab3d2947fff6e9d2e773f0d1cdf4e0150703c8670a91685af8 SHA512 866512d489ab4d4f7151308dface2354890192b618dfa3930c9508cde43df2b08bb6803a42975bb559ce3261a74e3f829a921101fba08ece98f929da96f3c6a0
-EBUILD pikopixel-1.0_beta9-r3.ebuild 616 BLAKE2B 3db887475e2ade7ba42e6fd810d98029c2e6fc83a3a1c667ab30cf7cf9cdb456496cf5be63c453752cb455c0c6a452c43356e17cbb8c90b838480ee8cb8540ab SHA512 8b49fa449c78bd945ec46539ec2246d5eb4bf866242d871ed7b06a2f58a1263cf87f04fff6945c83a2f12d397b1698b8b8b6bfdba464a682611f55e62876a2d0
-MISC metadata.xml 353 BLAKE2B 0a11dabc8c8d4cf8ac0cf566d4f8d6347c4fbbdd3a7501cdfa363c71f370b0898384f966664e8c8f9ae9bf4aec32071b068ee74220ad870970369c8eaeac3aa3 SHA512 638af177226e71ff4d13757ad1d909e627283e92e67475a842280525e3b9fa25980a2f4673b6a194a41b5cd08154e666345961bea4a5dce0e292c2ab6a2256f5
diff --git a/gnustep-apps/pikopixel/metadata.xml b/gnustep-apps/pikopixel/metadata.xml
deleted file mode 100644
index 22f9e3a4a31f..000000000000
--- a/gnustep-apps/pikopixel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a free application for drawing and editing pixel-art images</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
deleted file mode 100644
index f4ecbb903ae2..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}a
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
deleted file mode 100644
index aa1e3d93e1a9..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}b
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
deleted file mode 100644
index 641e11e784ea..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}c
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/preview-0.9 b/gnustep-apps/preview-0.9
new file mode 100644
index 000000000000..73a383a38017
--- /dev/null
+++ b/gnustep-apps/preview-0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Simple image viewer
+EAPI=6
+HOMEPAGE=http://www.sonappart.net/softwares/preview/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.sonappart.net/softwares/preview/download/Preview-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bac9d106cc824736922afe489d522dd0
diff --git a/gnustep-apps/preview/Manifest b/gnustep-apps/preview/Manifest
deleted file mode 100644
index 002a175c8415..000000000000
--- a/gnustep-apps/preview/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX preview-0.8.5-compilation-errors.patch 1047 BLAKE2B 6f732887f43265dcf1b6a7da6133e654fbdd71bacaca262f02c9aafc5ba338e2cc0b8c0c4dff4a6def89806b50c7515286a7a611ef4d8663e32fec695db000d4 SHA512 1b34f13c152767a739ade661dadd81891cd27f190b545b4304c7e1dd21f0246181b6abb2fcb835d648f77ee9fd55682a7a2af0a5c6ad672443007c9af1911668
-DIST Preview-0.9.tar.gz 77516 BLAKE2B 08de03008f8b1192e3ab3d41238a4147612a20e13596e6a9d464fbc2162e1fd2ea2869d528fc516f1db21693b5b347bcf022819890de20a571c962bc85beb7e7 SHA512 cfca47e8024f4db2486c3c9c9334b0f5b74f71e6386b227b417f62df541cddf2e2d77d50c9ffce7287284d1339bedb9c929e6254810f370229b59d325fc332ba
-EBUILD preview-0.9.ebuild 572 BLAKE2B e3a8549f32e9584f9b14cae2dffab54ea18eed2bd513e887ad51ae14fecb0a1d5b218b3a64137c229bfb7497af7a0c3eaae5fc5a6308552f348137cdd2e9143d SHA512 bdbd29c5e9ba2fd4a87cbcb05419b469083f92f1b37932e2a455410b7893031d6cb57f86183dbf98d168eb044ec4607519faaa7cc674c4a834326c5796889c01
-MISC metadata.xml 594 BLAKE2B 29ab695c7543b5bf232ed421dcc926f89977933852dfa752244c2a4656b7b83d310feee4357620ff4ae033875b8611bf0911b5a9074330c4c9d32ef6a6a8ed91 SHA512 8db875cb47658ce5a04b46bbdd9335291d131d5a58239fc88c43304d5083e96f91e6a7e03f2f2e6a91052b27bb57254d70f1c4d0875f1bd5e782e08be589cab6
diff --git a/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch b/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
deleted file mode 100644
index 247a7c8b171d..000000000000
--- a/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-2010-05-18  Federico Gimenez Nieto  <fgimenez@coit.es>
-
-	* Document.m: Import <AppKit/AppKit.h>.
-
-Index: preview.app-0.8.5/Document.m
-===================================================================
---- preview.app-0.8.5.orig/Document.m	2010-05-18 19:18:11.000000000 +0200
-+++ preview.app-0.8.5/Document.m	2010-05-18 19:18:23.000000000 +0200
-@@ -35,20 +35,7 @@
- 
- #include <Foundation/NSNotification.h>
- 
--#include <AppKit/NSApplication.h>
--#include <AppKit/NSAffineTransform.h>
--#include <AppKit/NSClipView.h>
--#include <AppKit/NSCursor.h>
--#include <AppKit/NSImage.h>
--#include <AppKit/NSImageView.h>
--#include <AppKit/NSMatrix.h>
--#include <AppKit/NSPasteboard.h>
--#include <AppKit/NSPopUpButton.h>
--#include <AppKit/NSScreen.h>
--#include <AppKit/NSScrollView.h>
--#include <AppKit/NSWindow.h>
--#include <AppKit/NSWindowController.h>
--#include <AppKit/NSScroller.h>
-+#include <AppKit/AppKit.h>
- 
- /*********************************************************************/
- /**************** NSDocument Private methods *************************/
diff --git a/gnustep-apps/preview/metadata.xml b/gnustep-apps/preview/metadata.xml
deleted file mode 100644
index c698becb0fe9..000000000000
--- a/gnustep-apps/preview/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-* Open GNUstep images file supported by GNUstep (usaly tiff/jpeg/gif/png)
-* Save as and Save To (tiff only)
-* Print and Page Layout
-* Zoom
-* The image can be copy into the Pasboard (to be paste or use by services)
-* Documentation
-* Source fully available
-* Release under the GNU GENERAL PUBLIC LICENSE 2
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/preview/preview-0.9.ebuild b/gnustep-apps/preview/preview-0.9.ebuild
deleted file mode 100644
index f7bac95e785d..000000000000
--- a/gnustep-apps/preview/preview-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2
-
-DESCRIPTION="Simple image viewer"
-HOMEPAGE="http://www.sonappart.net/softwares/preview/"
-SRC_URI="http://www.sonappart.net/softwares/preview/download/${P/p/P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN/p/P}
-
-PATCHES=(
-	# Fix compilation, patch from debian
-	"${FILESDIR}"/${PN}-0.8.5-compilation-errors.patch
-)
-
-src_prepare() {
-	default
-	sed -e 's/sel_eq(/sel_isEqual(/' -i Document.m || die
-}
diff --git a/gnustep-apps/price-1.2.0 b/gnustep-apps/price-1.2.0
new file mode 100644
index 000000000000..7a23e16769b0
--- /dev/null
+++ b/gnustep-apps/price-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Precision Raster Image Convolution Engine
+EAPI=5
+HOMEPAGE=http://price.sourceforge.net/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/price/PRICE-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3f687962463bbf8d646dcb42882f05f2
diff --git a/gnustep-apps/price-1.3.0 b/gnustep-apps/price-1.3.0
new file mode 100644
index 000000000000..980a49c460a9
--- /dev/null
+++ b/gnustep-apps/price-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Precision Raster Image Convolution Engine
+EAPI=6
+HOMEPAGE=http://price.sourceforge.net/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/price/PRICE-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3760a65df25fa3c06b5fad3f622729f0
diff --git a/gnustep-apps/price/Manifest b/gnustep-apps/price/Manifest
deleted file mode 100644
index f6cb52592d0e..000000000000
--- a/gnustep-apps/price/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST PRICE-1.2.0.tar.gz 265584 BLAKE2B 2ee51ccf56792cd8bc94315dc978146a9fafa2994c80c1f7202ee3ce48ce9c561f8b9bb64c1e7a5c54c70d548c9f36806f8819681bda3a8c40bf46286570204b SHA512 a8eca27c38afebd382d85ecb18003ad15ede16f7df057c3180cf0529473e884b0ddbfd143554407d07d10001d9a66621775be8d8db4a05febdfe430aa39f06b8
-DIST PRICE-1.3.0.tar.gz 275904 BLAKE2B 89adbb9f735c10aa87cac4b7f65b671231b6da6f3626d2cbb181dc02dff28a08934bdc7523b3ab49f30f906557449ccea98d55e96ff3048da2ec8fd2f3ce63d8 SHA512 dd9530d4c953922a218847420052859cddf23db5513ed8e0e8215c06a5e8f877560bdd039e56e7f47c646d8d8456f335a336a696467b290b7e8376f6ffffd542
-EBUILD price-1.2.0.ebuild 445 BLAKE2B 65ecbb5010df161273fe52a531b3b9985c9f0bc42ebdd49187e7ac27c161db53fd44af53a4f7589f99876a873dadd4f32631da777f9095426f8372f974281532 SHA512 eb8ad0a2c709a00ef69078cb7b7945248fc88c954a958ba60e026ef818207b97724b1b22abcd95f3fae23c94131c8a3345526cccad56eb5f2365df7da59dbfc2
-EBUILD price-1.3.0.ebuild 447 BLAKE2B 2a0bd3f73f784561e9e9e63987ff152dd0e851a75f5fa0a68e931ca18cb5eb3f0a0c7424c966e268847a7ecd5046b1221313b4e94a543b56f2ae93ae29c5ff89 SHA512 b9b60f450b3de0eedb77559b5259b63b6b7ffb5f744dbe5555a7163486c12370f5799fd42911d57c5fc85d36cfe350634db561a6864329509299540eb7be32a2
-MISC metadata.xml 701 BLAKE2B 96b51bf027aec9fe0261d7fe9f4b861d9184bedbc997206458e2b0fe4d0a25e289feecc35b41bb801aba08d6c325195dc730a600049304f67d7478c14b9ecc31 SHA512 cb025bb7bb2102e04a95ee04b842deea28ecd2b81a361320b3e8d01687c08f8e3afd312784ff2f129d0bae62d1483f38edfd4d63e63a0599d07fb0fb73e9bc3f
diff --git a/gnustep-apps/price/metadata.xml b/gnustep-apps/price/metadata.xml
deleted file mode 100644
index 67a6d04eaf95..000000000000
--- a/gnustep-apps/price/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-PRICE, which stands for Precision Raster Image Convolution Engine, aims to be a high quality Image filtering, enhancing and manipulation program. It is written in Objective-C and AppKit, so being designed for Cocoa and GNUstep, it should be portable to OpenSTEP (I hope so, currently I don't have the computers to do the porting).
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">price</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/price/price-1.2.0.ebuild b/gnustep-apps/price/price-1.2.0.ebuild
deleted file mode 100644
index b02f3fc12205..000000000000
--- a/gnustep-apps/price/price-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/price/price-1.3.0.ebuild b/gnustep-apps/price/price-1.3.0.ebuild
deleted file mode 100644
index c9a2e8ae4205..000000000000
--- a/gnustep-apps/price/price-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/projectcenter-0.6.2 b/gnustep-apps/projectcenter-0.6.2
new file mode 100644
index 000000000000..e57cea0fbaed
--- /dev/null
+++ b/gnustep-apps/projectcenter-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=An IDE for GNUstep
+EAPI=5
+HOMEPAGE=http://www.gnustep.org/experience/ProjectCenter.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/gdb-6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://ftpmain.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=489139fd425a9f3fc27217f702d5673e
diff --git a/gnustep-apps/projectcenter/Manifest b/gnustep-apps/projectcenter/Manifest
deleted file mode 100644
index a14b248355c1..000000000000
--- a/gnustep-apps/projectcenter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ProjectCenter-0.6.2.tar.gz 492409 BLAKE2B d34bd88c0a1b0cae86886a8f2ff322e595d002112c82883f14af66d2a33d2c66fbebee4b8f03ef8049aa054d255c88d594b2f0ffc5982fdbcf84d6ed97670d7d SHA512 91e6712fa03fcb7b6e8239f64ddf89dabb1b4c54f4799204e8e535c9c6ad430a5e98644e28af5b9727a0b5b57a866b4e0837f09e8aedfac863673508a7c67a78
-EBUILD projectcenter-0.6.2.ebuild 454 BLAKE2B 090bcab2a8ce8b1bfb6ba7427b87a2dbee4e9bde7d12ae23600a361e46ccfe68bd938b8d6a8a7ca86f49388651eaa346ad93e160b3e94af97cf6ec4b14a4f5d6 SHA512 50657f309c887aa99e128e95cc5bad48092dd71f9d212654459c53cb305876ecb743661d344521d204902ce22c522fcb4fff848d581b48eff987961ea8b54625
-MISC metadata.xml 557 BLAKE2B 7145c73c55e79dca99530b7dc2cc1b1af82370b1235172083018b8fb4a349bf37051cc78001076111039ae0c4712fff56a62132fa62b5e66839e626c7854d428 SHA512 de8ee824768eaf908c861c6d494424dee0e935c1abebe2fdc8bfbadd50dbd17fe205490c5f9304546a9e466854a5d6830a68608927e7518102de8ea77c9806ce
diff --git a/gnustep-apps/projectcenter/metadata.xml b/gnustep-apps/projectcenter/metadata.xml
deleted file mode 100644
index b351ee5712b4..000000000000
--- a/gnustep-apps/projectcenter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>
-ProjectCenter is GNUstep's integrated developement environment (IDE). It is based in part on NeXT's original Project Builder. It assists you in starting new projects and lets you manage your project files using a intuitive and well ordered graphical user interface.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
deleted file mode 100644
index 6177cc9fbfa4..000000000000
--- a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/projectc/ProjectC}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An IDE for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
-SRC_URI="http://ftpmain.gnustep.org/pub/gnustep/dev-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-devel/gdb-6.0"
diff --git a/gnustep-apps/simpleagenda-0.43 b/gnustep-apps/simpleagenda-0.43
new file mode 100644
index 000000000000..e9ace8dad0f6
--- /dev/null
+++ b/gnustep-apps/simpleagenda-0.43
@@ -0,0 +1,13 @@
+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
+DESCRIPTION=a simple calendar and agenda application
+EAPI=4
+HOMEPAGE=http://coyote.octets.fr/simpleagenda
+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 debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.43.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3afa1c2c230d17d6f6d87245e2ca9774
diff --git a/gnustep-apps/simpleagenda/Manifest b/gnustep-apps/simpleagenda/Manifest
deleted file mode 100644
index 4e4086f0bcb1..000000000000
--- a/gnustep-apps/simpleagenda/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SimpleAgenda-0.43.tar.gz 155517 BLAKE2B 25c7235eea2a1e5583ca3f1aeaa3b69894bf5d27500c6b03415cfcd18b76d7e1c0d8b93e8ae1cf05401822c801aecc5755b6321abc2e24b3616be6c19d366433 SHA512 85b67cdfb3db633f818adf923b491ecbc5d3767ed15b90f34adaf13737e4ffc5ad021b7be2021ad2017a7ba0a3c7a1a625c296d9a805b2acb948415a89b0a2b0
-EBUILD simpleagenda-0.43.ebuild 602 BLAKE2B 56aa25955c36266e6aa37be5f6d4c4fd447021e7670445fa3e96dc4e494fe7d3b37e2754525719fcc92d7881dfe89a9c507f9df5ecd4f59a509037a8a28a8b99 SHA512 7adcaf139df388495e9793127b7de78f35cb474cf2d68c46f90460f6511e203c502372fae077120e0ce6327ac3cc923336ac6668f2589e39a008e196466a8231
-MISC metadata.xml 334 BLAKE2B 48bb87639b197a9dda12757d85ad56ecefa07104696666d7a6de393893cd94f83209b25e2ee8177855ff52e10a5224a61fc9620b39637f44deaeb3ca7cf44e13 SHA512 824f543cbd6bd26b2a759cd0406048f1b2d1b233afeca9733e41660a46b4f9ebaf7b35e0643cf6436d8e83ac03cda73c308b1192765531b3248cc7396cdfaff2
diff --git a/gnustep-apps/simpleagenda/metadata.xml b/gnustep-apps/simpleagenda/metadata.xml
deleted file mode 100644
index 9c046724b997..000000000000
--- a/gnustep-apps/simpleagenda/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a simple calendar and agenda application</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild
deleted file mode 100644
index d1c7bf5cf1b7..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/simpleagenda"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus"
-
-DEPEND=">=dev-libs/libical-0.27
-	>=virtual/gnustep-back-0.20.0
-	dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_configure() {
-	egnustep_env
-	econf $(use_enable dbus dbuskit)
-}
diff --git a/gnustep-apps/sogo-3.2.10 b/gnustep-apps/sogo-3.2.10
new file mode 100644
index 000000000000..f6ee05a05f67
--- /dev/null
+++ b/gnustep-apps/sogo-3.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.10[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=6
+HOMEPAGE=http://www.sogo.nu
+IUSE=gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.10[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-3.2.10.tar.gz -> sogo-3.2.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b5d5dae7e93f7758966d2ad3d455802c
diff --git a/gnustep-apps/sogo-3.2.9 b/gnustep-apps/sogo-3.2.9
new file mode 100644
index 000000000000..572c1ef4897b
--- /dev/null
+++ b/gnustep-apps/sogo-3.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.9[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=6
+HOMEPAGE=http://www.sogo.nu
+IUSE=gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.9[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-3.2.9.tar.gz -> sogo-3.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b5d5dae7e93f7758966d2ad3d455802c
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
deleted file mode 100644
index 2300beb5224e..000000000000
--- a/gnustep-apps/sogo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616aee2cc5d6b2830ae3c4f3483924e15c59f44610eb8be656c21324f17270dd5eca6eb27780fe34 SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b
-AUX sogod.initd 681 BLAKE2B b8a55f93a0e623bb5aa13d10658aba644cb9a532d7a5c02beeee8d7e01365944531e081afe77562da8da77a42bec10a125bd386ede063ad230e0135e8bd56c03 SHA512 d6925d49c24ff6ebfd989016a5c0a707c1bc866070cbd9e4e8eca867ec81fe1ad78bd6606b13349ac7d251f62bd85f239b42f65e1d22015c38b4ad6fe9058f4e
-DIST sogo-3.2.10.tar.gz 32528115 BLAKE2B 7543f2165ed20026f00adfac7697fe6bc0e54f06b3c2ccb99fbfe0ddd14bcf8818521e161bb118789175c4245b67a8ad5dd0cd3ef71f61d34d869e1c0c2a4a93 SHA512 3dbd465592fd98968b32e251659a70306a781999bcfa9e63e142d75d7c9274edc7cbe5069881e939f0e9472f0ef8580e4e0f20059bfc97f8c69893d86c8cadf3
-DIST sogo-3.2.9.tar.gz 32443733 BLAKE2B 6a2ae4b5346bc48b9301263fe017308ee34aabcee1ce5444744b22c3af040533d98738fca29a195fd0f792d1d4470418840d0b1ff0e264c2ebc92877f420fa75 SHA512 070b3812d65598364d9204432678ea48705bf7481371e44442a13ad86d219415e24c579ad59212a7631922a527d30e69aeb17711c3abfc01960f663f4e0112a3
-EBUILD sogo-3.2.10.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
-EBUILD sogo-3.2.9.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
-MISC metadata.xml 442 BLAKE2B a70c31f8e7b1688d5b42869fe6795ee03f409b9fbcc67c263f5a81abb31f165324724d1e7fde0c3b0dae35d196dfbbfba205c457bd2ae0c007d282bfe82b50de SHA512 135d98d4b53981130f0070d5db4ca71beb9f1a42b36b67ee4d08423955f09ab852991eb7247b5f49851214894ee989f158d479db9bd17e0e455a994d445034b3
diff --git a/gnustep-apps/sogo/files/sogod.confd b/gnustep-apps/sogo/files/sogod.confd
deleted file mode 100644
index 906a6978d862..000000000000
--- a/gnustep-apps/sogo/files/sogod.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/sogod: config file for /etc/init.d/sogod
-
-SOGOD_WORKERS=3
-
-# Additional options for SOGo
-SOGOD_OPTS=""
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
deleted file mode 100644
index ad003be62c9b..000000000000
--- a/gnustep-apps/sogo/files/sogod.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SOGOD_PID=/run/sogo/sogod.pid
-
-depend() {
-	need net
-	need memcached
-	after postgresql mysql
-	after slapd
-	after mta
-}
-
-start() {
-	checkpath -q -d -m 0755 -o sogo:sogo $(dirname "${SOGOD_PID}")
-	ebegin "Starting SOGo service"
-	start-stop-daemon --start --quiet \
-		--user sogo --exec /usr/sbin/sogod \
-		--	-WOWorkersCount ${SOGOD_WORKERS} \
-			-WOLogFile /var/log/sogo/sogod.log \
-			-WOPidFile "${SOGOD_PID}" \
-			"${SOGOD_OPTS}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping SOGo service"
-	start-stop-daemon --stop \
-		--pidfile "${SOGOD_PID}"
-	eend ${?}
-}
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
deleted file mode 100644
index 2c4b6c6ef092..000000000000
--- a/gnustep-apps/sogo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">inverse-inc/sogo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/sogo/sogo-3.2.10.ebuild b/gnustep-apps/sogo/sogo-3.2.10.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	>=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-pkg_setup() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
-
-	default
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	./configure \
-		--disable-strip \
-		--prefix=/usr \
-		--with-ssl="${ssl_provider}" \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	newconfd "${FILESDIR}"/sogod.confd sogod
-	newinitd "${FILESDIR}"/sogod.initd sogod
-
-	insinto /etc/logrotate.d
-	newins Scripts/logrotate sogo
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-
-	insinto /etc/sogo
-	doins Scripts/sogo.conf
-
-	insinto /etc/cron.d
-	newins Scripts/sogo.cron sogo
-	keepdir /var/log/sogo
-
-	fowners sogo:sogo /var/log/sogo
-	fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog "SOGo documentation is available online at:"
-	elog "http://www.sogo.nu/downloads/documentation.html"
-	elog
-	elog "Apache sample configuration file is available in:"
-	elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/sogo/sogo-3.2.9.ebuild b/gnustep-apps/sogo/sogo-3.2.9.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	>=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-pkg_setup() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
-
-	default
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	./configure \
-		--disable-strip \
-		--prefix=/usr \
-		--with-ssl="${ssl_provider}" \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	newconfd "${FILESDIR}"/sogod.confd sogod
-	newinitd "${FILESDIR}"/sogod.initd sogod
-
-	insinto /etc/logrotate.d
-	newins Scripts/logrotate sogo
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-
-	insinto /etc/sogo
-	doins Scripts/sogo.conf
-
-	insinto /etc/cron.d
-	newins Scripts/sogo.cron sogo
-	keepdir /var/log/sogo
-
-	fowners sogo:sogo /var/log/sogo
-	fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog "SOGo documentation is available online at:"
-	elog "http://www.sogo.nu/downloads/documentation.html"
-	elog
-	elog "Apache sample configuration file is available in:"
-	elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/systempreferences-1.2.0 b/gnustep-apps/systempreferences-1.2.0
new file mode 100644
index 000000000000..95f1479a0b9d
--- /dev/null
+++ b/gnustep-apps/systempreferences-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=System Preferences is a clone of Apple OS X' System Preferences
+EAPI=5
+HOMEPAGE=http://www.gnustep.it/enrico/system-preferences/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6d3a94974928894d811227f394a57b8e
diff --git a/gnustep-apps/systempreferences/Manifest b/gnustep-apps/systempreferences/Manifest
deleted file mode 100644
index da5d8f37b23e..000000000000
--- a/gnustep-apps/systempreferences/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SystemPreferences-1.2.0.tar.gz 309496 BLAKE2B 5257ad38e9178967b70d074923dfea2b67eaf14db3fcdb5b53d7634735601d8aa2719efa568f368b26bb0029fe8b65b07e2fb9377386c4b77ddb63e9bc5a6a2b SHA512 22972ac0e51a19276375786759c2b7445691b2a0db4195a448ff1a68871561400fe1f4e194228e903f28d45416db3a00792b320f2749863300ea9117e7e99fbe
-EBUILD systempreferences-1.2.0.ebuild 450 BLAKE2B 469da5ac45988f855e822c60a208d3d1ef171bb89897f6c6de11c5d07211f7edeb611d74087706aec9fe6a0b531673613519ed900a03f425e579b4d97da179c2 SHA512 22890c3dcfe9e150ab69470df411c70d7dbb64bca1d6b06d82b733563c7ad0a760afd3af407b4d97de939b949b53c1ac77f1e93c2e7f7b75c3ac3fc2c051408d
-MISC metadata.xml 304 BLAKE2B a8ee817dcfb57cfa1bf8c89ac7756456b29b0681f834e6f62ae12a6e9554e038c980d2ff4b858581399418cd772b26a3df08939e473c6b01d962cb6072ce720a SHA512 6cbb5c1222ed264cf1ea39f73c22a5681614df03235f4e894b7332e78bd331c52c32a9904551b814d9203e1c029843aa80b3cc68362c79ed2d6270d732679589
diff --git a/gnustep-apps/systempreferences/metadata.xml b/gnustep-apps/systempreferences/metadata.xml
deleted file mode 100644
index 576a117aaf8e..000000000000
--- a/gnustep-apps/systempreferences/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer> 
-	<longdescription>
-		TODO
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild b/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
deleted file mode 100644
index 7fe54791a5f4..000000000000
--- a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=SystemPreferences-${PV}
-DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
-HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/talksoup-1.1 b/gnustep-apps/talksoup-1.1
new file mode 100644
index 000000000000..5e2a9333774a
--- /dev/null
+++ b/gnustep-apps/talksoup-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-libs/netclasses-1.1.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=IRC client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/talksoup/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-libs/netclasses-1.1.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/gap/TalkSoup-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ed6b5d8458f918a02d8abc21472246df
diff --git a/gnustep-apps/talksoup/Manifest b/gnustep-apps/talksoup/Manifest
deleted file mode 100644
index 0a3f31f43d65..000000000000
--- a/gnustep-apps/talksoup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TalkSoup-1.1.tar.gz 378488 BLAKE2B 1a96fa3e7cd02e745f1fa5205cada198646b2d3dad1f494959f4d99a3292dcb388ec7711d1967df880a54050d9b84654fab81d31c3845fa2f41691d795026ec6 SHA512 50ee170a4fe729656a5ce2b2d942430fd4e623254ea0750b7bbd3cf57a58340db6e7ae1227c2af7f02e41a53a6ff629821f88a3cca46fd71790bf40674b85395
-EBUILD talksoup-1.1.ebuild 443 BLAKE2B dbd169c2d65e6b35ec5085107643248daeb186049978a94a56cbe531ea1299782e1d1df44249b692b8f3727b3d16eb933db3a71e0ace2a5c0f303db32a51fddd SHA512 4934f5605f91d88a1fbd5985d906a66f5f3272963c610e96d3607f9185869b0581e9b2857043ef39937f9242c27958b8e879a8f591a89fd2eb94c2d423d10636
-MISC metadata.xml 506 BLAKE2B d130dfa77fad56b7eba251478532a6a76d56d110079701cd0bcd83379b93b50fe7a0bffd32ed46d32d8c206ba6b619a683fb804e07958563e60b024c994556d0 SHA512 4a3b0578fe70cc65f74c11b5b22505cdc474e9e14002fe7c510a1361950d968e21776568927891907f17baa301ffa59a7670ccb16881e5c361f40df26400070f
diff --git a/gnustep-apps/talksoup/metadata.xml b/gnustep-apps/talksoup/metadata.xml
deleted file mode 100644
index 7ab1815b1f14..000000000000
--- a/gnustep-apps/talksoup/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>TalkSoup is an IRC client for GNUstep and Mac OS X. It is highly configurable and extensible with a fully-featured plugin system already in place. It has all the features one would expect from a graphical IRC client.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/talksoup/talksoup-1.1.ebuild b/gnustep-apps/talksoup/talksoup-1.1.ebuild
deleted file mode 100644
index 38910e8eeb51..000000000000
--- a/gnustep-apps/talksoup/talksoup-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="TalkSoup-${PV}"
-
-DESCRIPTION="IRC client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/talksoup/"
-SRC_URI="http://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=gnustep-libs/netclasses-1.1.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/terminal-0.9.8 b/gnustep-apps/terminal-0.9.8
new file mode 100644
index 000000000000..d240763e2602
--- /dev/null
+++ b/gnustep-apps/terminal-0.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A terminal emulator for GNUstep
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/terminal/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d69f6683ecedced76343a7349180e106
diff --git a/gnustep-apps/terminal-0.9.9 b/gnustep-apps/terminal-0.9.9
new file mode 100644
index 000000000000..41369b1ea361
--- /dev/null
+++ b/gnustep-apps/terminal-0.9.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A terminal emulator for GNUstep
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/terminal/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f352803746030e4beb499b91f17021cc
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
deleted file mode 100644
index 4662a2f5c3a3..000000000000
--- a/gnustep-apps/terminal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Terminal-0.9.8.tar.gz 110520 BLAKE2B 7f2f219cb76c8765b9fb4b5017834ab73a10429a8d0843a3c0b01909d54c21979867546d33c6bf07a4aed2cdbb1dc392effdf7e5e6b6f7096748e9fe9c96a13a SHA512 dc282f52662e0e65553562e6684af7ffab25afb62badee5c22c3b5d03c31a75d172b35706512e98d4fa14d68bd3643e0158c67ff61755deab77741d71bf219c0
-DIST Terminal-0.9.9.tar.gz 88762 BLAKE2B a160a5946df6e0261f7f04db4cceb11925f14c814d2c4d66fb34f2febf0efa5d8fb99834a1ba5642e5bd8f7a36d1d30ae830a83cc3c7a36657c8b50325d3c922 SHA512 456b0755ee6751eb3ef1c5e62e969b6981f7874cb358e071fc7edda93b2ebc698224c990ba4335aa62a7acefb9085723e924d1311c96ae8d34d0f8b2c7c920a3
-EBUILD terminal-0.9.8.ebuild 449 BLAKE2B 601d48b8f1a0cae97cd3bc4f891e18b9ce4ef748d3c30e06aa3384d8ad3cf5eeceed1550379cad6fc6ad903696dcfe4b94fb56e5e0919618faa49d745ad95e72 SHA512 3f7d9aa9aefe3e7f29e2dcdbed11275359a149abf5a77163c6d64c6472ebb6fc7d3eb8b124a4cbe060fd551f63995b9cdc595bec1e404263650e46ed6715b52c
-EBUILD terminal-0.9.9.ebuild 452 BLAKE2B 3888011cc3f81aedc1836e3016ab469db70f4a0bc8646fa52e9f5e01fbf9e4f5463fe14e928ea10eb3dcad04b45bfbd2e258665f1f4b3595787a32a4dba7a5f8 SHA512 94d1646a98ba109eec6b60b25d07ff4d03e321b2e2a872fbbd14f0e36241986cc57ce7820ad6930a88f30a4f05d5d558d2c1b32947aa0f773132f878251e6ac3
-MISC metadata.xml 398 BLAKE2B 866baa4e6d912372f4f78059fba2d0244b6adb27910fd54609f2d22259159c1f8a958773e0eb2b0f94c37b34df5c2e65b96cf9ce0d5568ea31b36f5c3be64b22 SHA512 2be2b5a6ff68fad1a03fc4949ef471dc6c9a2c7c9b4401308b893b886c6af925ecf3c817a49bd9cbad3111154e64ccce2cf57cea1915220513c6d0e01a8dddf1
diff --git a/gnustep-apps/terminal/metadata.xml b/gnustep-apps/terminal/metadata.xml
deleted file mode 100644
index 759eb3f6cb07..000000000000
--- a/gnustep-apps/terminal/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Terminal.app - copyright (c) 2002 Alexander Malmberg alexander@malmberg.org
-a terminal emulator for GNUstep
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/terminal/terminal-0.9.8.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
deleted file mode 100644
index 724bd7200af1..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"
diff --git a/gnustep-apps/terminal/terminal-0.9.9.ebuild b/gnustep-apps/terminal/terminal-0.9.9.ebuild
deleted file mode 100644
index 751aa1be4172..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"
diff --git a/gnustep-apps/textedit-0.95_pre20100427-r1 b/gnustep-apps/textedit-0.95_pre20100427-r1
new file mode 100644
index 000000000000..95dfecb4e7bc
--- /dev/null
+++ b/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A text editor with font, color, and style capabilities for GNUstep
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/backbone/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3bbe13ac0d97a889c096ed7f9e3bbeb
diff --git a/gnustep-apps/textedit/Manifest b/gnustep-apps/textedit/Manifest
deleted file mode 100644
index cfc85c585580..000000000000
--- a/gnustep-apps/textedit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX textedit-0.95_pre20100427-gcc47.patch 1138 BLAKE2B c1d070e651a162a95f538bcd5ce67068d0c95e12f984c33f7e18dd2c1bda3eb514748930cf88fa20214680eecbdccce5261b0a3451433ef76771fe22241c73bc SHA512 d270ae159399c6a3c3bf8dc815aaf0cbc294151944ff08fe8691093fc8fa26332ec75a86afece97c3b73abb68660cc0e5fbe7ef1145b0a155aeda347c6c3c13e
-AUX textedit-0.95_pre20100427-nsinvalidargument.patch 706 BLAKE2B 3946e4e16f6de2312e779a9f0e16502d5a98d4581cf82e929212af171932ca1280311d837bda2cb5ae97e979211f66a9199f5aa063ad1078ab6f62bfeba2be2b SHA512 251418c683a8b29f47ddd8c67d59573673931576de6455b1365003f51f9c7a3ff53b4e3041e78fe0ed8eeaec62dd730a3c4da13cf30de9b0fea64423fc943f18
-DIST textedit-0.95_pre20100427.tar.gz 131332 BLAKE2B 443c54e243ca23bc1805778e912847f02bd118a9859a61f0c959a4cdeeba91f77daeb53f45f2de4d83defa421d11f3f5ae0c15585ee6ffbbe8dbb108f9a1b6e1 SHA512 df46ce1d0eb61ee776a0c4318f743f365d4d632ec0bbf9d04d1e6afbd35456f4a396fcafcac70e924475ccb2bb8dbbbf7dea18a68014f9634212c2803db59596
-EBUILD textedit-0.95_pre20100427-r1.ebuild 495 BLAKE2B 6bd0e12deaba0fcb5619ea00bd3600ff4a6ed5d0461c246188fbf6bffe11cc5dd16fd94690af10d00f6342fe6aae9dee163fdb6ee291414347f79495b09914c2 SHA512 b8ba3064d37b692d45ec276de39de9252359df9a3d9a6ca006e5afb33aaa0d94a554f270bbb0fd6ae4eba5eb57c18eb02f71c4ffc80a7db9c1094f3516b31fef
-MISC metadata.xml 394 BLAKE2B b7f81fb353d28af53c512d9382e041958efbfcd5f14d68b091f5b5a2f0cb7d36d26c4080dbeff5ef5138061143f06df62b016c97fccad12332ad1b4bb78f2240 SHA512 3ec6a6a517708d591b37510f55b26e22d42e31b42b24b8221a6834158dfa59ec42916c93ccf72a2043454bcb23235b322fc5419213f7122d6a2a7a96665e063e
diff --git a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch
deleted file mode 100644
index b2a0bfedcd3c..000000000000
--- a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- textedit.app-4.0+20061029.orig/Document.m
-+++ textedit.app-4.0+20061029/Document.m
-@@ -1361,13 +1361,13 @@ validateToggleItem (NSMenuItem *aCell, B
- {
- 	SEL			action = [aCell action];
- #ifdef GNUSTEP
--	const char	*sel_name = sel_get_name (action);
-+	const char	*sel_name = sel_getName (action);
- 
--	if (!strcmp (sel_name, sel_get_name (@selector (toggleRich:)))) {
-+	if (!strcmp (sel_name, sel_getName (@selector (toggleRich:)))) {
- 		validateToggleItem (aCell, [self isRichText], _(@"&Make Plain Text"), _(@"&Make Rich Text"));
--	} else if (!strcmp (sel_name, sel_get_name (@selector (togglePageBreaks:)))) {
-+	} else if (!strcmp (sel_name, sel_getName (@selector (togglePageBreaks:)))) {
- 		validateToggleItem (aCell, [self hasMultiplePages], _(@"&Wrap to Window"), _(@"&Wrap to Page"));
--	} else if (!strcmp (sel_name, sel_get_name (@selector (toggleHyphenation:)))) {
-+	} else if (!strcmp (sel_name, sel_getName (@selector (toggleHyphenation:)))) {
- 		if (!hyphenationSupported())	// Disable it
- 			return NO;
- 		validateToggleItem (aCell, ([self hyphenationFactor] > 0.0), _(@"Disallow &Hyphenation"), _(@"Allow &Hyphenation"));
diff --git a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch
deleted file mode 100644
index 345a0641fcbc..000000000000
--- a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- textedit.app-4.0+20061029.orig/Document.m
-+++ textedit.app-4.0+20061029/Document.m
-@@ -124,12 +124,6 @@
- 		[self setViewSize: size];
- 	}
- 
--	[[NSNotificationCenter defaultCenter]
--		addObserver: self
--		   selector: @selector (fixUpScrollViewBackgroundColor:)
--			   name: NSSystemColorsDidChangeNotification
--			 object: nil];
--
- 	potentialSaveDirectory = nil;
- 	return self;
- }
-@@ -195,10 +189,6 @@
- 	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- 
- 	[center removeObserver: self
--					  name: NSSystemColorsDidChangeNotification
--					object: nil];
--
--	[center removeObserver: self
- 					  name: NSTextStorageDidProcessEditingNotification
- 					object: [self textStorage]];
- 
diff --git a/gnustep-apps/textedit/metadata.xml b/gnustep-apps/textedit/metadata.xml
deleted file mode 100644
index 0c76e2ff1bd4..000000000000
--- a/gnustep-apps/textedit/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-TextEdit
-
-This directory contains the source code for the TextEdit demo, which is a simple text editor.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
deleted file mode 100644
index c1ded6382b92..000000000000
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-S=${WORKDIR}/TextEdit
-
-DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
-HOMEPAGE="http://www.nongnu.org/backbone/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	epatch "${FILESDIR}"/${P}-nsinvalidargument.patch
-}
diff --git a/gnustep-apps/zipper-1.5 b/gnustep-apps/zipper-1.5
new file mode 100644
index 000000000000..be81d2816de8
--- /dev/null
+++ b/gnustep-apps/zipper-1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Zipper is a tool for inspecting and extracting compressed archives
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/zipper
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Zipper-1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=97f8f7a921b9db6217e0d69ed86c0ca5
diff --git a/gnustep-apps/zipper/Manifest b/gnustep-apps/zipper/Manifest
deleted file mode 100644
index 5d1d21ad646f..000000000000
--- a/gnustep-apps/zipper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Zipper-1.5.tar.gz 81557 BLAKE2B cbd3201de2ba8edd10d3d9a4a748ab559ce1aeafb95ee68ef2a9f2b978d1e08585f519bd557676932a0a4e38a7b401150d6b80d91296df281fc50295cee47e77 SHA512 4b3353c0513f6fb4431778d03a4f980a592d19bbb3dcaface5c618b88a9c76bb7d067cca38fe20ccafc6c3636cd6b2e17b2a2e273673b2ba1153faa6f68ef348
-EBUILD zipper-1.5.ebuild 404 BLAKE2B 362dfbf5f987f411b201eca82451a2897dd27541f7e55154bcdac788329b2bfe10d52111136292a519f7b6195260e875a94582a3f5d2bb7782e612ddcfa12930 SHA512 5493ee9bf5e35cd7f77976d191ced6ae4d24ed612d4d4517388eae418073d5db09743fd4998d171d94b28e8d65fbc31b3b897c6c9c72ab0de9751f0c0e9800a8
-MISC metadata.xml 379 BLAKE2B d47143db4c160090d7b5582b0f8251220cbd0b6f36939ce3dc6c9cab06412dc8e79e7da34d52d9fa16b50928811ea170a9ad671317f812883327b0a9d067b778 SHA512 6f3b1c08459825f43a5d81eebb2e10c98d7330c09cb3f0dd3c746fa6ae299d6872f3400a39a41fc08d0ae3d9bbc14b2e20205efe84a845c9556695c5bf6ad4e2
diff --git a/gnustep-apps/zipper/metadata.xml b/gnustep-apps/zipper/metadata.xml
deleted file mode 100644
index 536e3caa28a4..000000000000
--- a/gnustep-apps/zipper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Zipper is a tool for inspecting the contents of a compressed archive and for extracting.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/zipper/zipper-1.5.ebuild b/gnustep-apps/zipper/zipper-1.5.ebuild
deleted file mode 100644
index 92dcaebe97af..000000000000
--- a/gnustep-apps/zipper/zipper-1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/z/Z}
-
-DESCRIPTION="Zipper is a tool for inspecting and extracting compressed archives"
-HOMEPAGE="http://gap.nongnu.org/zipper"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/z/Z}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:58:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:58:29 +0100
commit	0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree	07815070629c7c11000a7f51ceb8ccbccb49a809 /gnustep-apps
parent	1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)