gentoo resync : 14.07.2018

51 files changed, 695 insertions, 170 deletions

diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 99c8a41f79c3..b2795ac1ad72 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/cenonlibrary-4.0.0 b/gnustep-libs/cenonlibrary-4.0.0
deleted file mode 100644
index a363215a3596..000000000000
--- a/gnustep-libs/cenonlibrary-4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=Default library required to run Cenon
-EAPI=5
-HOMEPAGE=http://www.cenon.info/
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=Cenon
-RDEPEND=>=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/CenonLibrary-4.0.0-1.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_=a4417d91ff125973a2dd9162f2ed13ef
diff --git a/gnustep-libs/cenonlibrary/Manifest b/gnustep-libs/cenonlibrary/Manifest
new file mode 100644
index 000000000000..d429d42247d3
--- /dev/null
+++ b/gnustep-libs/cenonlibrary/Manifest
@@ -0,0 +1,3 @@
+DIST CenonLibrary-4.0.0-1.tar.bz2 2131692 BLAKE2B 2f00e3c5b743e239b116493e23f4bd6acee34b0f88d02ed791b4cec8487a24b28b442cecd3483773f8339eb93bcc0b1065edc0d2a15179d1caa83ad218700e5b SHA512 75d1acc2635cb5daee3311d2c54a43abf9d0de7b29997fec86effc4dd3932fe73449c08cda642d1f92adcea9da74cd4732014bb04f7418c1f331701bafe44427
+EBUILD cenonlibrary-4.0.0.ebuild 535 BLAKE2B 156dd723a037f4031b19ab02e2fc15baa927acfe4dd61dc45e2656e7734ad8ade94205c013dd1301b30e90cb9c36d56bc171ab00f5928c401a8460ef9aa37c1f SHA512 a30ef96cf04e290f25af5a85ca96c0b10f9a10cb730a34ffbe390447c1bfcdf74fa370622eef4d52ced6bc006b12d1690b4373ca0fed1d5da241eab546ee40cc
+MISC metadata.xml 514 BLAKE2B 279e28730fdba3e0a619038a0ee87724083dfe4ec052ca387aa869b3f0a7fab76be6d7731ebd864cc3f3c21d594e13536125559196d9b0978fc1c61bf6a79b28 SHA512 06125a3d405f811589e4312606ab281719b8856d52bdcaeb78b414e20236b1f3e916d738c3df8d676f2853f53ea44f1226f14472b8b055630fc649cb8f5aa51d
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
new file mode 100644
index 000000000000..ef8bf528a2b6
--- /dev/null
+++ b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit gnustep-2
+
+S=${WORKDIR}/Cenon
+
+DESCRIPTION="Default library required to run Cenon"
+HOMEPAGE="http://www.cenon.info/"
+SRC_URI="http://www.cenon.zone/download/source/CenonLibrary-${PV}-1.tar.bz2"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+LICENSE="Cenon"
+IUSE=""
+
+src_compile() {
+	echo "nothing to compile"
+}
+
+src_install() {
+	egnustep_env
+	dodir ${GNUSTEP_SYSTEM_LIBRARY}
+	cp -pPR "${S}" "${D}"${GNUSTEP_SYSTEM_LIBRARY}
+}
diff --git a/gnustep-libs/cenonlibrary/metadata.xml b/gnustep-libs/cenonlibrary/metadata.xml
new file mode 100644
index 000000000000..133f8e2acd95
--- /dev/null
+++ b/gnustep-libs/cenonlibrary/metadata.xml
@@ -0,0 +1,14 @@
+<?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.
+		This package contains the supporting libraries for cenon itself.
+	</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/dbuskit-0.1.1 b/gnustep-libs/dbuskit-0.1.1
deleted file mode 100644
index f8693a0f0de5..000000000000
--- a/gnustep-libs/dbuskit-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-apps/dbus-1.2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
-EAPI=5
-HOMEPAGE=http://www.gnustep.org
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb57d53bb289aef3bcedcfe2e3473b49
diff --git a/gnustep-libs/dbuskit-0.1.1-r1 b/gnustep-libs/dbuskit-0.1.1-r1
deleted file mode 100644
index bf77402f997f..000000000000
--- a/gnustep-libs/dbuskit-0.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=sys-apps/dbus-1.2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
-EAPI=6
-HOMEPAGE=http://www.gnustep.org
-IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6fba3b11ca875ba4faf22a0eaf240d96
diff --git a/gnustep-libs/dbuskit/Manifest b/gnustep-libs/dbuskit/Manifest
new file mode 100644
index 000000000000..0583a14ae83d
--- /dev/null
+++ b/gnustep-libs/dbuskit/Manifest
@@ -0,0 +1,5 @@
+AUX dbuskit-0.1.1-remove_gc.patch 926 BLAKE2B 16ba95a5966f4c3e666ad786dcd9d4f3a6db3aef0ebdbeab1f7882d931d4a935cd956ada3f9b2d85905bbd0a38b118e630fd4789bbf5907b925c465c12a9dc2d SHA512 37e72f44aaaa670ea61511592a899fd9573c838c93f2a7da246d8aaeceeac03454369887f5c63fdfd778cbddd78fc89440f07ebb5e0089f4035a830bdf1497a4
+DIST dbuskit-0.1.1.tar.gz 706783 BLAKE2B 3963b955d16bea9bb063142277f367748a4c9b005c63d17904b3421cfa6d9a8590d2d2ac1037dfb592ff62ed5e3988682ea14ddb0c45bde2b71fc9f3cd5ef5fc SHA512 1d98a05bda7558ebca80c5a4985009bdcb2f875c25f44872a2ae589793deb2d6d832c91e3eeaed7846980f5921a6a543efd04db3f7b228a0d0bae37cdc5ccfae
+EBUILD dbuskit-0.1.1-r1.ebuild 799 BLAKE2B 66fba694420f7aea44ecda6e949fff4abbdfe9507e95b5d5ee3ed2dd407bd4cec3b4d15b1f581f6962c446a7ca6c4272547dce4d4162c4b2f424e90b6130d01a SHA512 830607a3fa462440b74f462d9cf8ccd3ae22355aa21ab63a941789cd7648d63724c70dc076ba4ddd2d3237203c411c6eb1da3743cce48fa676a923dd9b1b8404
+EBUILD dbuskit-0.1.1.ebuild 739 BLAKE2B 5271bb9c1a7ca8ad91d43c9bdfec5d5db3838b2f9ec0ddcf0d69fdbd8172ed2a1183dd7f3da7f7b4cce8f99c6dceeaf03ff52b363f0a99e1d645a661892e24cd SHA512 23e488d4c0675b7aaf0e1233e87ab9d65107dc7234f38eef591402cfcd0a6b669bf31fc2da1a4fce99421cadf0a0c0506458b513945f3117daada12ece46e7ed
+MISC metadata.xml 619 BLAKE2B c1a7767af86a48d595b038bdfff6e59f71bad20870f64c130452e68d185f70c02f22b4f3592394bc4b61be8bd140892b74b0564d12531fb348f52f696de9cc9c SHA512 9748c7f960bc4ee8e21b4bd7109fe45bb34f288387456b0e69a1062ef4b43b70af18415e8a3f73a9a74349860cbb84a2a7dc29d98db8979a32043fb6c03ec284
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..de48698483fe
--- /dev/null
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnustep-2
+
+DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="http://download.gna.org/gnustep/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/dbus-1.2.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( ${FILESDIR}/${P}-remove_gc.patch )
+
+src_prepare() {
+	default
+
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	# Bug 410697
+	sed -e "s#ObjectiveC2/runtime.h#ObjectiveC2/objc/runtime.h#" \
+		-i configure.ac || die "ObjectiveC2 runtime sed failed"
+
+	eautoreconf
+}
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild
new file mode 100644
index 000000000000..7176cc290c8b
--- /dev/null
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools gnustep-2
+
+DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="http://download.gna.org/gnustep/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/dbus-1.2.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	# Bug 410697
+	sed -e "s#ObjectiveC2/runtime.h#ObjectiveC2/objc/runtime.h#" \
+		-i configure.ac || die "ObjectiveC2 runtime sed failed"
+	eautoreconf
+}
diff --git a/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch b/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch
new file mode 100644
index 000000000000..cc20e8dbe166
--- /dev/null
+++ b/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch
@@ -0,0 +1,29 @@
+--- trunk/Source/DKNotificationCenter.m	2016/03/26 05:10:00	39611
++++ trunk/Source/DKNotificationCenter.m	2016/03/28 06:16:41	39612
+@@ -519,7 +519,7 @@
+   {
+     return nil;
+   }
+-  observer = GS_GC_HIDE(anObserver);
++  observer = anObserver;
+   selector = aSelector;
+ 
+   // Make sure the necessary components are there and that the selector takes a
+@@ -535,7 +535,7 @@
+ 
+ - (id)observer
+ {
+-  return GS_GC_UNHIDE(observer);
++  return observer;
+ }
+ 
+ - (SEL)selector
+@@ -561,7 +561,7 @@
+   // callback and need to avoid the reentrancy. We do this by scheduling
+   // delivery of the notification on the run loop.
+   [[NSRunLoop currentRunLoop] performSelector: selector
+-                                      target: GS_GC_UNHIDE(observer)
++                                      target: observer
+ 				    argument: notification
+ 				       order: UINT_MAX
+ 				       modes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
diff --git a/gnustep-libs/dbuskit/metadata.xml b/gnustep-libs/dbuskit/metadata.xml
new file mode 100644
index 000000000000..d55fc839b21a
--- /dev/null
+++ b/gnustep-libs/dbuskit/metadata.xml
@@ -0,0 +1,9 @@
+<?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 DBusKit framework offers tight integration of D-Bus services into Objective-C applications. It handles all low-level details of communication with D-Bus daemons and the services connected to them and exposes an interface similar to Distributed Objects to make it easy for Objective-C programmers to access D-Bus services.</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/gsldap-0.0.1_pre20070219 b/gnustep-libs/gsldap-0.0.1_pre20070219
deleted file mode 100644
index e6642afe6c96..000000000000
--- a/gnustep-libs/gsldap-0.0.1_pre20070219
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=GNUstep LDAP library for open ldap C libraries
-EAPI=6
-HOMEPAGE=http://www.gnustep.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=mirror://gentoo/gsldap-0.0.1_pre20070219.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_=80d64d8631cbe7f4a514364fb1128eba
diff --git a/gnustep-libs/gsldap/Manifest b/gnustep-libs/gsldap/Manifest
new file mode 100644
index 000000000000..64f510e5075b
--- /dev/null
+++ b/gnustep-libs/gsldap/Manifest
@@ -0,0 +1,3 @@
+DIST gsldap-0.0.1_pre20070219.tar.gz 33275 BLAKE2B 012cc8b8aea304bce6793c9eee13a61e92fcd13727ada8f5191d904ce1e7abb636c727a464f3bfd6b2dd142a60d3e3b7dc06ca83e9fdd2113b45467b79ca9d2f SHA512 b7915e75f76eb97ef033ce0516c6c1606f4bbf81465b1ac93053a92858706ce50f3e3746e04e3e4bf6b4ffc822917c0816ca03f5cb5f79ac50bd9018100bf216
+EBUILD gsldap-0.0.1_pre20070219.ebuild 510 BLAKE2B 9bec7a9a20f68c6a34031a5f25443b78b240b59435854dd3652d03f7a9f7c7eaf715c3f4256ac069fc4b0c36e3d44cc7def6e16dd609a7f3f842e77b2449323e SHA512 35f9b37ea46f80e3097f6176cd659ff69a988de9bbbb42ee4bba817fe6961c2db6c1f59c80e6e25788a7b3f5048fe0319166e61861f1c2708f56ea04a4e5d4a8
+MISC metadata.xml 433 BLAKE2B 5c460239a173969011977881845dfdceeb92b9d39bdde02036c7df39a2d2bfe496d9cf2ad5d609c3923064ce533b5669db7d5a4c33f850b7d23ad34c6ac87e35 SHA512 8a4b076edc720fe2d02324304bec6b0b153b55ecf524b10d36836dc1ef0e33541bd39e175f9972f25840ecfd2ccd2a364183b621dad1f44e0ee0743aa3416378
diff --git a/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild b/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild
new file mode 100644
index 000000000000..4deadee636c5
--- /dev/null
+++ b/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnustep-2
+
+DESCRIPTION="GNUstep LDAP library for open ldap C libraries"
+HOMEPAGE="http://www.gnustep.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-nds/openldap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s|#include <GNUstepBase/GSCategories.h>||" \
+		GSLDAPCom.h || die "GSCategories.h sed failed"
+}
diff --git a/gnustep-libs/gsldap/metadata.xml b/gnustep-libs/gsldap/metadata.xml
new file mode 100644
index 000000000000..db4934e58761
--- /dev/null
+++ b/gnustep-libs/gsldap/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+		gsldap is a library which use open ldap (www.openldap.org) C
+		libraries to provide an  Objective-C interface to access LDAP
+		Servers
+	</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/highlighterkit-0.1.3 b/gnustep-libs/highlighterkit-0.1.3
deleted file mode 100644
index 2297b0f1edb1..000000000000
--- a/gnustep-libs/highlighterkit-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=Syntax highlighter framework
-EAPI=5
-HOMEPAGE=http://wiki.gnustep.org/index.php/HighlighterKit
-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://download.gna.org/gnustep-nonfsf/HighlighterKit-0.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_=a34967b1288c51fbecad9cdfd7f76e42
diff --git a/gnustep-libs/highlighterkit/Manifest b/gnustep-libs/highlighterkit/Manifest
new file mode 100644
index 000000000000..84fe79f0230f
--- /dev/null
+++ b/gnustep-libs/highlighterkit/Manifest
@@ -0,0 +1,3 @@
+DIST HighlighterKit-0.1.3.tar.gz 54952 BLAKE2B 1d1561b83808245694eaf45c9c1265c7a4c089c8a6f78c04a4db64ff49f1a76e83b875f5f6874df5bdb9c31d7889272080dd381bb2aadedc0b7ce66dd373fa08 SHA512 3a6fbd8387ec545b7004b8ddb7e5210a1a6d324d584499b6c0e99f1f74a6cd453b9451aae59d6c4147c8aebb4556b500d1477d3a05211bc19aae5a64d9133e86
+EBUILD highlighterkit-0.1.3.ebuild 413 BLAKE2B f9329351b973b3efb9802ba271901d42ad8506b65d921a851f0ed9c212fcec17c6922ca4b57037e418e76c7d04b9210ce342820ae233173ea5a052071ede3a18 SHA512 74b1c864652129e8e520826334a335c2bf5a82b94eb6ddcf595e6ce5a751b420b077b3e86a23154d177e9712674d681cc02182943f367358dd90dbce06ac96dd
+MISC metadata.xml 406 BLAKE2B 3dabc89cf368fa5b3301e5908b7c7486dc4419679a19b2b24145f226c9486836c5869f5ea0b32d1679a5ae9f6112994af06cbc131faa57bf0c809eaef5249ff5 SHA512 55baea8414ec41f7e0585f5ef1d8da5ecc00abe670258a7156f00afc4847e3c70b2d445784bd1c372939f52298fabdfdd5ca7dbb9a1420d7b2c87d44b2ddd76e
diff --git a/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild b/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild
new file mode 100644
index 000000000000..a4ebe1190da7
--- /dev/null
+++ b/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit gnustep-2
+
+MY_P="HighlighterKit-${PV}"
+
+DESCRIPTION="Syntax highlighter framework"
+HOMEPAGE="http://wiki.gnustep.org/index.php/HighlighterKit"
+SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/gnustep-libs/highlighterkit/metadata.xml b/gnustep-libs/highlighterkit/metadata.xml
new file mode 100644
index 000000000000..9d74e72b1f60
--- /dev/null
+++ b/gnustep-libs/highlighterkit/metadata.xml
@@ -0,0 +1,9 @@
+<?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>HighlighterKit is a framework to allow easy incorporation of syntax highlighting features into your application.</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/metadata.xml b/gnustep-libs/metadata.xml
new file mode 100644
index 000000000000..0cd2afaae61a
--- /dev/null
+++ b/gnustep-libs/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The gnustep-libs category contains GNUstep libraries.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie gnustep-libs enthält Bibliotheken für die
+		GNUstep-Umgebung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría gnustep-libs contiene las librerías de GNUstep.
+	</longdescription>
+	<longdescription lang="ja">
+		gnustep-libsカテゴリーにはGNUstepライブラリが含まれています。
+	</longdescription>				
+	<longdescription lang="nl">
+		De gnustep-libs categorie bevat GNUstep bibliotheken.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm gnustep-libs chứa các thư viện GNUstep.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria gnustep-libs contiene le librerie di GNUstep.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria gnustep-libs contém as bibliotecas de GNUstep.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria gnustep-libs zawiera biblioteki GNUstep.
+	</longdescription>
+</catmetadata>
+
diff --git a/gnustep-libs/netclasses-1.1.0 b/gnustep-libs/netclasses-1.1.0
deleted file mode 100644
index 95191f8518c6..000000000000
--- a/gnustep-libs/netclasses-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=An asynchronous networking library for GNUstep
-EAPI=6
-HOMEPAGE=http://gap.nongnu.org/talksoup/
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2 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/netclasses-1.1.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_=0c5ca675acd684765674d020c7d25161
diff --git a/gnustep-libs/netclasses/Manifest b/gnustep-libs/netclasses/Manifest
new file mode 100644
index 000000000000..5f8cb66860cb
--- /dev/null
+++ b/gnustep-libs/netclasses/Manifest
@@ -0,0 +1,4 @@
+AUX netclasses-1.1.0-no_rfc.patch 410 BLAKE2B 0fc6ff01a80998b7f41420499ec79aecb93150efad04c366c7cb768f939da3115e0fd42d366b0f567fcaca49bbd85c26951c160ac42e4afd9a9d38b024294f5c SHA512 11a2db7a5b1123acafe1b47ea68946118328ce4af751b2521bdef592f0cddd9e0a21deaaed83a3112f44c6a292da881b5313e537724d45e18fc7fbc2a334ca65
+DIST netclasses-1.1.0.tar.gz 92479 BLAKE2B 4683a59e42347e49bc4cd25900545389358f1c80d64b9b55f2d7d94f3dfd3521bfa179649ebc42d489f2104152bc0e05ed98f07e93466c65a6323a8f0a576b05 SHA512 9db604189260237f5ad6e8314abdd8475fc2d462273ab851062af6175be44b347e0da40c70706bcae2800cef89f38a1e37a0f33c53d97681713bd1f22786b8c5
+EBUILD netclasses-1.1.0.ebuild 406 BLAKE2B f1f7836b62345b68ee6602a99d3aba1d76ab2682e89c07dfa8054acb4813a98f1d1a8910dec057ca99db96078d93afd2a0cc132f00365d39a01ce2fe9c432ef5 SHA512 54cf52686e9f04d9daa7970172863bfb942ac1b213b2c607b7f5f1e7202cd7c671334765e5ac2aa104c855ab23db303a677e68d7294477b436dcf75cc0bf28d7
+MISC metadata.xml 592 BLAKE2B baa743584293ca71993e73cb3869c9ffe0637ea66a37016072cddab800000e81108caab4a4416431c67dd3237bb0c911d00f7b74f4ca9d32402f5ab6ed7c7392 SHA512 53e0cdf62f13171ed7a986c207105d13a14dfbac8df740f32d5b72b8c63330fa9324c9fa70c541101047093b549513abd2354126b0bd955ee4e6bcb59dc2afd7
diff --git a/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch b/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
new file mode 100644
index 000000000000..16936db956c9
--- /dev/null
+++ b/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
@@ -0,0 +1,8 @@
+diff -Naur netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble netclasses-1.1.0/Documentation/GNUmakefile.postamble
+--- netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble	2014-06-10 10:16:08.000000000 +0200
++++ netclasses-1.1.0/Documentation/GNUmakefile.postamble	1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-before-all::
+-	mkdir -p $(DOCUMENT_NAME)
+-	cp -f rfc1459.txt $(DOCUMENT_NAME)
+-
diff --git a/gnustep-libs/netclasses/metadata.xml b/gnustep-libs/netclasses/metadata.xml
new file mode 100644
index 000000000000..1e5277913294
--- /dev/null
+++ b/gnustep-libs/netclasses/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+		netclasses is an asynchronous networking library that works on
+		OS X natively, and any of the multitude of platforms supported
+		by GNUstep. You've never seen an easier way to put together
+		network applications!
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">netclasses</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-libs/netclasses/netclasses-1.1.0.ebuild b/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
new file mode 100644
index 000000000000..ca6e8bc37101
--- /dev/null
+++ b/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+DESCRIPTION="An asynchronous networking library for GNUstep"
+HOMEPAGE="http://gap.nongnu.org/talksoup/"
+SRC_URI="https://savannah.nongnu.org/download/gap/${P}.tar.gz"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${P}-no_rfc.patch )
diff --git a/gnustep-libs/pantomime-1.2.2 b/gnustep-libs/pantomime-1.2.2
deleted file mode 100644
index 05bef11e06f5..000000000000
--- a/gnustep-libs/pantomime-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of Objective-C classes that model a mail system
-EAPI=5
-HOMEPAGE=http://www.collaboration-world.com/pantomime/
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=LGPL-2.1 Elm
-RDEPEND=dev-libs/openssl:0= >=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/Pantomime-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_=63467d716a5d3aa23e95daff002e4719
diff --git a/gnustep-libs/pantomime-1.2.3 b/gnustep-libs/pantomime-1.2.3
deleted file mode 100644
index dd64721ec64c..000000000000
--- a/gnustep-libs/pantomime-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of Objective-C classes that model a mail system
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html
-IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1 Elm
-RDEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=mirror://nongnu/gnustep-nonfsf/Pantomime-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_=76d1b7e8897edd32e38d05c096cc4071
diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
new file mode 100644
index 000000000000..dbb691277a70
--- /dev/null
+++ b/gnustep-libs/pantomime/Manifest
@@ -0,0 +1,5 @@
+DIST Pantomime-1.2.2.tar.gz 468276 BLAKE2B fcd740b52acd5351fe1d257b6bf5c0f517183e24bc8c8ac6c7753f3047b3b941817ba65a130e43f2b8b9e1f51f0759238420f84dcfc75b7ac49b23e69156c8bb SHA512 198c1e0248f47bbd2cc284eec0d804959ea2a51e4a4810f8909048b41fc4bfbbaab9fc86e1ad507611a77382f353b357615c52845228e2411a0da7af88b2988f
+DIST Pantomime-1.2.3.tar.gz 474666 BLAKE2B b2fc4db717f06a3fea889a2b99de4ca88f5253e0cdf026d96b24200ccd01b6eca058869eaef0a52cfd4585585e7e909ac39d1ad50b7e788a97bb3eeb75784634 SHA512 01c56411a6822dbe246c1ff7f2c8be7654e8a0b2fb2c0b4e868ea80a47a16ba832cf4a912bf5eb66e7823900d835698966d64f51bf414978cef2cb606a215ad6
+EBUILD pantomime-1.2.2.ebuild 759 BLAKE2B 93080ff4fdf39f74db63a0e141488cf4c8bb75fe9cce1142a84a61ebafa784d85f5c863296e90c9788a86e4f11b87222746c621463444441519eb39e1f8581e5 SHA512 5d8add82e9ad7611870ba4ec2dc873094897e7b48d4e63684d68d0027f19fb4dd114076b82775b6afdc0b5bbdd6146584bb6759118f0d0ffbea8ee1183e7fb87
+EBUILD pantomime-1.2.3.ebuild 622 BLAKE2B 61e85ba003797c19987574dfe480e4745e4f936abe4b549e0ff60ee070096a6e2160c8b3f1f02b0147954561325fa956c0df70761fd500eb3317f7f3fc28c6df SHA512 d61795b7a49be9565f1f55906494541c93c94fadd71506cc0de375b7a1dbf761ce11d1b8d2222f76f2ceeb8b9946e4bf6c7f574daf0c0bd2f9c725b7cccbb502
+MISC metadata.xml 437 BLAKE2B c0cdcb5ca0acd059966be1c055a4e1c53405e9b0ba1a3db3f61f1dc90fac27afe36707c29099f1ae0e6aa2f6258e9bd7e99ec922b10d1a5e8e2c679b212b0919 SHA512 16697a1ec563eed2bd922aa07fc29c312fbeccbecef4964741ae99685c88743f1224f027791da6cd85e93612023e46365c6dc114705044a5b1d94043c8b124b9
diff --git a/gnustep-libs/pantomime/metadata.xml b/gnustep-libs/pantomime/metadata.xml
new file mode 100644
index 000000000000..f26605696466
--- /dev/null
+++ b/gnustep-libs/pantomime/metadata.xml
@@ -0,0 +1,13 @@
+<?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 set of Objective-C classes that model a mail system.
+Author Ludovic Marcotte ludovic@Sophos.ca
+The name "Pantomime" was proposed by Jay Kominek.
+</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/pantomime/pantomime-1.2.2.ebuild b/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
new file mode 100644
index 000000000000..6a0806e6054e
--- /dev/null
+++ b/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils gnustep-2
+
+MY_P=${P/p/P}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A set of Objective-C classes that model a mail system"
+HOMEPAGE="http://www.collaboration-world.com/pantomime/"
+SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 Elm"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s|ADDITIONAL_LDFLAGS|LIBRARIES_DEPEND_UPON|" \
+		Framework/Pantomime/GNUmakefile || die "as-needed sed failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	cd "${S}"/Documentation
+	dodoc AUTHORS README TODO
+	docinto rfc
+	dodoc RFC/*
+}
diff --git a/gnustep-libs/pantomime/pantomime-1.2.3.ebuild b/gnustep-libs/pantomime/pantomime-1.2.3.ebuild
new file mode 100644
index 000000000000..3d45d2507118
--- /dev/null
+++ b/gnustep-libs/pantomime/pantomime-1.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnustep-2
+
+MY_P=${P/p/P}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A set of Objective-C classes that model a mail system"
+HOMEPAGE="http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html"
+SRC_URI="mirror://nongnu/gnustep-nonfsf/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 Elm"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+src_install() {
+	gnustep-base_src_install
+
+	cd "${S}"/Documentation
+	dodoc AUTHORS README TODO
+	docinto rfc
+	dodoc RFC/*
+}
diff --git a/gnustep-libs/performance-0.5.0 b/gnustep-libs/performance-0.5.0
deleted file mode 100644
index adc581525734..000000000000
--- a/gnustep-libs/performance-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=Help improve the performance of GNUstep applications
-EAPI=6
-HOMEPAGE=http://wiki.gnustep.org/index.php/Performance
-IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-3
-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/libs/Performance-0.5.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_=29f6c2d7ca21f33fd50ef12fd852f57f
diff --git a/gnustep-libs/performance/Manifest b/gnustep-libs/performance/Manifest
new file mode 100644
index 000000000000..a84e965ab476
--- /dev/null
+++ b/gnustep-libs/performance/Manifest
@@ -0,0 +1,3 @@
+DIST Performance-0.5.0.tar.gz 50569 BLAKE2B b79f27fc0974c6005725b916cfb528c15d380b62dea2b846c129fda04e4b56ad33d00c4432d19f0ee9bfa3593cd9fa8781d0dbd168c26cceb9e007054252d7b2 SHA512 ac83d046c801e1c2b69c708fa806cccf40fca4d5dabe5d461524c3c3eea989c939a11e58d8bff177f45e55a3e1be73bd03b0bb80b611c8390560740cd5cf9fd5
+EBUILD performance-0.5.0.ebuild 566 BLAKE2B 96076852e3b834a65b3d917196e4d8a9da4f71c91565e5a5acb692ce24438a391a168f8f2863eea74d7ac1b9f367720d0e6cc0ecc80b134fdeb159e1f7ad0b3e SHA512 a17efa9f4f9150868de791f64e981d0e42524c4d2a2a20ff619e86c20694a273a2f4951c2d3dc78957a531fd28815f528dbcdc2a2e8d571294aac88ef52e4e52
+MISC metadata.xml 368 BLAKE2B 653d9f2799b5cf5be3a6a8214fd71db599e2603f64bbf0d49320ad9b3b970c0aeb4977d736cd89b812afeffa1c3d3c107a780a9832e12cf50b4e1268b518fb32 SHA512 bbed0181555aa329b43ef8839daff91b7dc447a25992687b0009ab63327fb3568b5753bf3406febabc7c75f90f5786b70fdc7708f6bf99c3caaf7c39d750a40e
diff --git a/gnustep-libs/performance/metadata.xml b/gnustep-libs/performance/metadata.xml
new file mode 100644
index 000000000000..3f6082034133
--- /dev/null
+++ b/gnustep-libs/performance/metadata.xml
@@ -0,0 +1,9 @@
+<?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 collection of classes to help improve/tune performance of your software </longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/performance/performance-0.5.0.ebuild b/gnustep-libs/performance/performance-0.5.0.ebuild
new file mode 100644
index 000000000000..5f6bcc8b2665
--- /dev/null
+++ b/gnustep-libs/performance/performance-0.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+MY_P=${P/p/P}
+DESCRIPTION="Help improve the performance of GNUstep applications"
+HOMEPAGE="http://wiki.gnustep.org/index.php/Performance"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-3"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e '/documentation\.make/d' GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	default
+}
diff --git a/gnustep-libs/renaissance-0.9.0-r1 b/gnustep-libs/renaissance-0.9.0-r1
deleted file mode 100644
index 6403436e271e..000000000000
--- a/gnustep-libs/renaissance-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=GNUstep Renaissance allows to describe user interfaces XML files
-EAPI=6
-HOMEPAGE=http://www.gnustep.it/Renaissance/index.html
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=http://www.gnustep.it/Renaissance/Download/Renaissance-0.9.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_=c33995f967193ffd0edae5d3493603ba
diff --git a/gnustep-libs/renaissance/Manifest b/gnustep-libs/renaissance/Manifest
new file mode 100644
index 000000000000..70366e351090
--- /dev/null
+++ b/gnustep-libs/renaissance/Manifest
@@ -0,0 +1,4 @@
+AUX renaissance-0.8.1_pre20070522-docpath.patch 1071 BLAKE2B ab6229fa8e9bce80c74611acfb5ebdb8f7a907c134f327f9c013af872d2e3a3abe69bddf6514f9579381edd2e67688aeb05b90d7c657718f8e9d27f873270c4f SHA512 99d32b951824ed85e3f9455bacb2410ad990c5e6af5debf52ae257ba64e5dad91f01270ed93fcbfd1a25c8d7a4706c30735aae199a1bf5f1fae2c1d750d828ec
+DIST Renaissance-0.9.0.tar.gz 404888 BLAKE2B fbaf2665dfe1f27e716298873eb0b01c9b76fbed305c18fedd8b377f1dcaecf5ab6d5250586f597ab7f51cbe667f870c0c07b5fb9d607f878561d1d510b7e4e3 SHA512 67ee9612619ef9d6ba3c4fbad7b561206424b235735e847df091e05593fa57001201196cfd0b5c8e6027299cb6d68de75442ef82b44178535c60110df29cdf64
+EBUILD renaissance-0.9.0-r1.ebuild 488 BLAKE2B 0bdc78f45cbf3d15089c321aa08456573f74e834a7e6c03ddd0301258f4cb0be9d60f67f525576c344ef5874d09400a9e853b32c189d20def185296f896c76be SHA512 ce1f406b396ec33b31411abd378cbc77780eed34cce17520b3bafbe9b1f7244cec5e07a47c3bb1711f87da0952a70669e94a7fcfd9dc82af17bf6eea4ddedbcd
+MISC metadata.xml 1288 BLAKE2B c0287c6eb3a7ac5586a3b4aa1fbce8a194e4173c20f4cbf7c52077d250f434551a75b1e07837bc1868c51a00d9ee947dc2208dab1d7dbc418beebdc1074ed4ce SHA512 96e6192c305ac7b47c6dbbadf688a1cc595b36c55ee4f9a2b7550977abbcb3ba12347fe95efde62d91b1f38dd270a2d7ea624aae53de395207fdfe3026c08fdb
diff --git a/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch b/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch
new file mode 100644
index 000000000000..df4f8c43ca1e
--- /dev/null
+++ b/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch
@@ -0,0 +1,21 @@
+diff -Naur renaissance-0.8.1_pre20070522.orig/Documentation/GNUmakefile renaissance-0.8.1_pre20070522/Documentation/GNUmakefile
+--- renaissance-0.8.1_pre20070522.orig/Documentation/GNUmakefile	2007-10-17 14:32:41.000000000 +0200
++++ renaissance-0.8.1_pre20070522/Documentation/GNUmakefile	2007-10-17 14:33:18.000000000 +0200
+@@ -8,6 +8,7 @@
+ macros.tex \
+ autolayout.tex \
+ gsmarkup.tex
++manual_DOC_INSTALL_DIR = Developer/Renaissance
+ 
+ SUBPROJECTS = Tutorials
+ 
+diff -Naur renaissance-0.8.1_pre20070522.orig/Documentation/Tutorials/Renaissance/GNUmakefile renaissance-0.8.1_pre20070522/Documentation/Tutorials/Renaissance/GNUmakefile
+--- renaissance-0.8.1_pre20070522.orig/Documentation/Tutorials/Renaissance/GNUmakefile	2007-10-17 14:32:41.000000000 +0200
++++ renaissance-0.8.1_pre20070522/Documentation/Tutorials/Renaissance/GNUmakefile	2007-10-17 14:33:07.000000000 +0200
+@@ -3,5 +3,6 @@
+ DOCUMENT_NAME = Renaissance
+ 
+ Renaissance_LATEX_FILES = Renaissance.tex
++Renaissance_DOC_INSTALL_DIR = Developer/Renaissance
+ 
+ include $(GNUSTEP_MAKEFILES)/documentation.make
diff --git a/gnustep-libs/renaissance/metadata.xml b/gnustep-libs/renaissance/metadata.xml
new file mode 100644
index 000000000000..c3412174d787
--- /dev/null
+++ b/gnustep-libs/renaissance/metadata.xml
@@ -0,0 +1,29 @@
+<?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>
+Welcome to GNUstep Renaissance!
+
+GNUstep Renaissance is free software (GNU LGPL), and part of the
+GNUstep project.  It is a development framework which runs on top of
+the GNUstep libraries.  It also works on top of the Apple Mac OS X
+Cocoa libraries, providing an opaque layer to write portable
+applications.
+
+In short, GNUstep Renaissance allows you to describe your user
+interfaces (that is, the windows in your application, and the buttons,
+boxes, textfields, etc in the windows) in simple and intuitive XML
+files, using an open, standard format describing the logic of the
+interface.  GNUstep Renaissance can then, at run time, generate the
+user interfaces (using the native host OpenStep-like libraries) by
+reading the XML files.  The connections between the objects created
+from the XML files, and the other objects in the application are done
+via outlets (as traditionally in OpenStep); a new quick and intuitive
+syntax has been developed to make creating outlets as easy as
+possible.
+	</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild b/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..3b3a87fae083
--- /dev/null
+++ b/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+DESCRIPTION="GNUstep Renaissance allows to describe user interfaces XML files"
+HOMEPAGE="http://www.gnustep.it/Renaissance/index.html"
+SRC_URI="http://www.gnustep.it/Renaissance/Download/${P/r/R}.tar.gz"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P/r/R}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.1_pre20070522-docpath.patch )
diff --git a/gnustep-libs/sope-3.2.10 b/gnustep-libs/sope-3.2.10
deleted file mode 100644
index 37d2d2988ab5..000000000000
--- a/gnustep-libs/sope-3.2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of frameworks forming a complete Web application server environment
-EAPI=6
-HOMEPAGE=http://www.sogo.nu/
-IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.10.tar.gz -> sope-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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/gnustep-libs/sope-3.2.9 b/gnustep-libs/sope-3.2.9
deleted file mode 100644
index ba5ce92c2f05..000000000000
--- a/gnustep-libs/sope-3.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of frameworks forming a complete Web application server environment
-EAPI=6
-HOMEPAGE=http://www.sogo.nu/
-IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.9.tar.gz -> sope-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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
new file mode 100644
index 000000000000..3dde6492db7e
--- /dev/null
+++ b/gnustep-libs/sope/Manifest
@@ -0,0 +1,5 @@
+DIST sope-3.2.10.tar.gz 2197170 BLAKE2B 29c3400d3162b2bd659d06fbd806fcfa3307fbf6f00048567e26c3fdac5e492bd511773b402f79b92db457e9dc995b5dadd5dc84baf6cbd89b463ae5e4d65457 SHA512 09c0e8ca7333e89c48e30b19dc3bbacca5a28688145848ff332ff304f92a791b3895774e5fd1f77c6d4c8615ecb5a461ba348792502fc7c5bbd9d445a191bccf
+DIST sope-3.2.9.tar.gz 2196831 BLAKE2B 9f62310ed61893d85d38f192b5639de44a8e6240463563c64e9c0551624c9bfafdddad5e6a819f15cf7fa12842d55fe417bff3972fe42fe07ac8e99655d90730 SHA512 ffa3d63eed5862aba9740ab84408297218ad6cd75b0dc7e40f2810366281bf139c55e27c11405b51dc1cf640d5f5434ee14c2d5f1d0384ad50684c23d8bc58b7
+EBUILD sope-3.2.10.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
+EBUILD sope-3.2.9.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
+MISC metadata.xml 442 BLAKE2B c22c04cfdb873406b9b6c25ca6b6be0800c21847c62d08e46c3d6077bdf008bef48e9ae510eb193379bf68e239d577a081bca6b4ced2b1295dce707365779b7b SHA512 f3bc549fe00de1ba3f2f0d89d8a9e12a3dd2dea22e7afc26774de402ec73f97eb7408622c82eb9aace249e9edc358fa431a41d6ab71bf10ba0002652be359136
diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
new file mode 100644
index 000000000000..57b2b4522b3c
--- /dev/null
+++ b/gnustep-libs/sope/metadata.xml
@@ -0,0 +1,15 @@
+<?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/sope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnustep-libs/sope/sope-3.2.10.ebuild b/gnustep-libs/sope/sope-3.2.10.ebuild
new file mode 100644
index 000000000000..550358b4884d
--- /dev/null
+++ b/gnustep-libs/sope/sope-3.2.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+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
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sope/sope-3.2.9.ebuild b/gnustep-libs/sope/sope-3.2.9.ebuild
new file mode 100644
index 000000000000..550358b4884d
--- /dev/null
+++ b/gnustep-libs/sope/sope-3.2.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+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
+}
+
+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
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sqlclient-1.8.1 b/gnustep-libs/sqlclient-1.8.1
deleted file mode 100644
index 580ab40cd02c..000000000000
--- a/gnustep-libs/sqlclient-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=GNUstep lightweight database abstraction layer
-EAPI=6
-HOMEPAGE=http://wiki.gnustep.org/index.php/SQLClient
-IUSE=java mysql postgres +sqlite elibc_FreeBSD java debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-3
-RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-REQUIRED_USE=|| ( java mysql postgres sqlite )
-SLOT=0
-SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e670e5b3bfa373cce3c2b7643d2a681f
diff --git a/gnustep-libs/sqlclient/Manifest b/gnustep-libs/sqlclient/Manifest
new file mode 100644
index 000000000000..d2664f93a6be
--- /dev/null
+++ b/gnustep-libs/sqlclient/Manifest
@@ -0,0 +1,3 @@
+DIST SQLClient-1.8.1.tar.gz 148622 BLAKE2B 824d7510dacaa813b9b696530cbc4c3ab49c6de3303a6c4c8694226907c84b780f0eb5ec1298214247a41191a393931c89aba7d08c6e3cc5ef953fa6e1553ce1 SHA512 f0339063bf1f0a9050826440f9d4c116fddf61e62f4a8fd4c694afd079d82b54b306dcdadcd29951bbb3502129de211d166e2958de4d31cd6e78563498f2b50f
+EBUILD sqlclient-1.8.1.ebuild 1124 BLAKE2B 8e4fcdf6eef24215e962770b1ce54ba94c5af3182efc44e5e0b3c11ee94dee38eb5151382ac2340414679d9609e8365d5ead3146709e4a7d3f0bfb6a572b3f50 SHA512 83855211fe2bececedcec1bfc3ed309583b44001932b446d0cd0bbf6d14334b46a74c0c65402f02bd69b7e0bb3814cea09279eefc0a953bca79ef1c5c70bd020
+MISC metadata.xml 796 BLAKE2B 1695ffe2d2b9fe6ff8038689854907b7ec6290c027f3f7a5ab03098db92b79862ccfc67f6f5f8c3233aea0f06df37fce63f5f5361e43ea98186bb3a8a7a5bbc2 SHA512 a395bcea0e303cfd0a2a37fb51c13ea1828aad9e9dea0cc8d271e9f94d1073f1b99bf3162eaa2094e8e0e251e476505a1f94c1e4b00816e6cce4599e2cc02b4b
diff --git a/gnustep-libs/sqlclient/metadata.xml b/gnustep-libs/sqlclient/metadata.xml
new file mode 100644
index 000000000000..d044d0bd0362
--- /dev/null
+++ b/gnustep-libs/sqlclient/metadata.xml
@@ -0,0 +1,11 @@
+<?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 SQLClient library is designed to provide a simple interface to SQL databases for GNUstep applications. It does not attempt the sort of abstraction provided by the much more sophisticated GDL2 library but rather allows applications to directly execute SQL queries and statements.
+
+SQLClient provides for the Objective-C programmer much the same thing that JDBC provides for the Java programmer (though SQLClient is a bit faster, easier to use, and easier to add new database backends for than JDBC).</longdescription>
+</pkgmetadata>
diff --git a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
new file mode 100644
index 000000000000..6861f637d3cb
--- /dev/null
+++ b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit java-pkg-opt-2 gnustep-2
+
+MY_P=${P/sqlc/SQLC}
+DESCRIPTION="GNUstep lightweight database abstraction layer"
+HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="java mysql postgres +sqlite"
+
+RDEPEND=">=gnustep-libs/performance-0.3.2
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( java mysql postgres sqlite )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if ! use doc; then
+		# Remove doc target
+		sed -i -e '/documentation\.make/d' GNUmakefile \
+			|| die "doc sed failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=""
+	use java || myconf="${myconf} --disable-jdbc-bundle"
+	use mysql || myconf="${myconf} --disable-mysql-bundle"
+	use postgres || myconf="${myconf} --disable-postgres-bundle"
+	use sqlite || myconf="${myconf} --disable-sqllite-bundle"
+
+	egnustep_env
+	econf ${myconf}
+}