gentoo resync : 14.07.2018

71 files changed, 295 insertions, 1772 deletions

diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index ae30c203367b..3ddac05fadbb 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/gnustep-back-art-0.25.0 b/gnustep-base/gnustep-back-art-0.25.0
new file mode 100644
index 000000000000..87247c9c3f82
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=170a90411dd2cae0f63a677e2944b945
diff --git a/gnustep-base/gnustep-back-art-0.25.1 b/gnustep-base/gnustep-back-art-0.25.1
new file mode 100644
index 000000000000..cc9d89932d7e
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6076d25ccca56d564a04a2144b039d5a
diff --git a/gnustep-base/gnustep-back-art-0.26.2 b/gnustep-base/gnustep-back-art-0.26.2
new file mode 100644
index 000000000000..17ceadbe522c
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=70ffe2db655c900533ec3e6044afeef0
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
deleted file mode 100644
index 4ee80b5c2eb5..000000000000
--- a/gnustep-base/gnustep-back-art/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-art-0.25.0.ebuild 2077 BLAKE2B b797b4e6a40a1207115c153276c45fcc7ba1f067e1b0477a94bf6467d636ef6a1bc4e53420480b035b4891bde1710014e0f2f9b18b8accd5a43440b7d6d3466b SHA512 8d129e05455d8039cea12ac7f085b50a17e12f0c1da0de560fcdb2b440181764a601d71fc6ced662867f6ba4ba98e8b133af9f8fb935e00e024be2df36058d7e
-EBUILD gnustep-back-art-0.25.1.ebuild 2081 BLAKE2B 246c59e1a549a8944bf3f02b7c0452eb61fe3e02aa77dc707b3f8e578bd16372c9775d27d78154b5a46945415ddfb6bf626a5c47b45cf9bcc8c2ff0ffa9456c4 SHA512 21f1a96b3c3c4ffd92754149a192511003e23d131092dc53bf3fffa512ae92cb8a84d352cbde60cae2ef08cf5eb6ebb982e108dc38f54325a50ea7b161c5f552
-EBUILD gnustep-back-art-0.26.2.ebuild 2081 BLAKE2B e0297415c6e046aab06fa5149dc87b7b3c77b51fbc5cc87381282bda73665e69c4a4bc229dc2500135c2c67795257f0620f85773bdf536c7d40698949337a484 SHA512 0c558edbf5d870010b35b67515fbca9b9f97ccb7bc642a055e1b14af8c6f6a96f38b63b9d2d83882a438b7faa4ca2e5a0813b5d7a7238d5e06123a1268de83d3
-MISC metadata.xml 1189 BLAKE2B 10dfa03030e2aa7412a4432eaa2c89727873fb6d567b30b112ebdc37099d14c120712b8632f50c692bd7079577b7dc43ecd0dfc9bc2c0b5bf491d32cbafb1360 SHA512 ab320e4962fcd3abcf36b6082cdf81e3e9cbd94408fa949569589a2880737e725a002b816c455cb61136f8a54e3f45b20fbfc59a52d7707f7fc443b11bbdddbc
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild
deleted file mode 100644
index 40454b1087e6..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild
deleted file mode 100644
index 7e99c2440f4e..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild
deleted file mode 100644
index d178338f8d18..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/metadata.xml b/gnustep-base/gnustep-back-art/metadata.xml
deleted file mode 100644
index 70ccbad3dada..000000000000
--- a/gnustep-base/gnustep-back-art/metadata.xml
+++ /dev/null
@@ -1,28 +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>
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This package installs a backend that supports libart_lgpl.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-back-cairo-0.25.0 b/gnustep-base/gnustep-back-cairo-0.25.0
new file mode 100644
index 000000000000..5897835de055
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4c6e73087ca068dc339cd0f8d1937f48
diff --git a/gnustep-base/gnustep-back-cairo-0.25.1 b/gnustep-base/gnustep-back-cairo-0.25.1
new file mode 100644
index 000000000000..8f5fbf4250e9
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45c3edca016da5da3f2319b0c6b5da2c
diff --git a/gnustep-base/gnustep-back-cairo-0.26.2 b/gnustep-base/gnustep-back-cairo-0.26.2
new file mode 100644
index 000000000000..4bc276906939
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=72705c563d468b8375e17f7717d7282c
diff --git a/gnustep-base/gnustep-back-cairo/Manifest b/gnustep-base/gnustep-back-cairo/Manifest
deleted file mode 100644
index 59da988be5bc..000000000000
--- a/gnustep-base/gnustep-back-cairo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-cairo-0.25.0.ebuild 1099 BLAKE2B f3aba11eeacff699addea5d6bc6e59b3cb9a38c86aaebbbd3d408bd28fea66aa259fc8d09bf16e2cc46ac018e2a7c4fe61cda7a0dd2923a1f22ec4e9d918e149 SHA512 640c5e203e8a5082b71d9f5099d12d78c1967ad7540ae0785bd8283192a9d33dee80bc82cf395b533d6806512f3732a97c3964f847b9e4c7244bef2a888428c2
-EBUILD gnustep-back-cairo-0.25.1.ebuild 1103 BLAKE2B 2d0e827f9305d299c7c87378680334f2e1635be8aa49562259d4038cd79eff8dcce61aed69231be10290963728d51db878edeef55418ea74516ae1dcb4b450ed SHA512 ae85a55826f01ce0ccffad8a5a2d78a74f8128d62f828e9c8c633704e95aa8883cb8259c4948a3df257a693b4e5f4fd6b637e097242896c011291b2eaa63ae94
-EBUILD gnustep-back-cairo-0.26.2.ebuild 1103 BLAKE2B 0512bfebe347f6534378312be4fec325e723734f543a6d39525f778e17b4839a57c769d67d34aab486d1e3947b06f4b9f8185f2271f8a2265ce7486472be68ed SHA512 28725d1bdbb5958069792d69137e252d1bd73955279178bc302f2940197c93db11def75940d51308ad4291925700c5626d142ed2b177f561fbc752cc90e1acff
-MISC metadata.xml 411 BLAKE2B 77e073c47fbb179efafabc609b3975c85ed445e2c4c88726c75ac17adbbc285178e972d1e9a594a5597530115bd0d077d41438cd3c0d5d3939eab5742e5d4f6a SHA512 34914c27b9630177e6686a9a67f2a864c5130b41b4835c9fae12a3df6c6f81a04a15c41ee4e9d9e707dfeedb546b41caf0460c3a2f180375f8e244553e6b699c
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild
deleted file mode 100644
index 35666cd92808..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild
deleted file mode 100644
index 3f1e6ec37e06..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild
deleted file mode 100644
index bce99c6bd9d1..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/metadata.xml b/gnustep-base/gnustep-back-cairo/metadata.xml
deleted file mode 100644
index 3b202e881261..000000000000
--- a/gnustep-base/gnustep-back-cairo/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>
-	Cairo back-end component for the GNUstep GUI Library.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-back-xlib-0.25.0 b/gnustep-base/gnustep-back-xlib-0.25.0
new file mode 100644
index 000000000000..23820d6f6dc5
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7633cd17e55a5b35302e141aae68e06a
diff --git a/gnustep-base/gnustep-back-xlib-0.25.1 b/gnustep-base/gnustep-back-xlib-0.25.1
new file mode 100644
index 000000000000..41fa5784848e
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6bb50fd66363144961ea10135af36ed5
diff --git a/gnustep-base/gnustep-back-xlib-0.26.2 b/gnustep-base/gnustep-back-xlib-0.26.2
new file mode 100644
index 000000000000..8eb1d7ff38c7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3748bf919a707c44e8b6d49fbe43140
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
deleted file mode 100644
index 695e6dbbb07a..000000000000
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-xlib-0.25.0.ebuild 1061 BLAKE2B 2997a32313fb318225d19892df23f16d17ad0c024a9dd64655c03a925262ee47222b560a9233b36c713bcff251e87e490cfc7651ae83e2d883adcc65d92e7a1e SHA512 6b007796b6a85068d0caff28e4ba0a0bf96c4f910cfbc7a30f565f01c098d5817e254fa53f90d425413596a25c389db1b56055c803dc5b7579709c7867a725a6
-EBUILD gnustep-back-xlib-0.25.1.ebuild 1065 BLAKE2B 04f5edf9168756e9e4fb7a08feb3cc35695b6c25ac4781cd3b751fdd9ee945bac62222d305d74d7c8f30dac3282e760ea64b1a01ec755b415dc9620ce4d58acc SHA512 9353bccff959db3b412d784ff1bce22ade4c8dae4d335807d6d207b3fa261b2f7b6c6cd69bd8c7eb392bbe38d6352d911cc9d0bfe3fe2be6da293355b2d49e8f
-EBUILD gnustep-back-xlib-0.26.2.ebuild 1065 BLAKE2B 4f3969000a52c4a1dbe835d6348371a40e013b6b2236c29c785cfbfd93835c0958a49bbd7f496167a93cee81434af63af72c19803ed518e5895756d4eae77845 SHA512 36f9034038d9cbaf9806be401ea26ec8cc7af49a46bf9334ce5684bb0ea64f6a76067b89e6debd2f388e5a17116ca38229379ba85f1b54ddccb9ae02c7f2748f
-MISC metadata.xml 1181 BLAKE2B ee1be4fedf7a4798dd49867781e58c5c068311c1ab5ef52c08d4f5af889b1c78803d68985dfeab54bb821ba80ae88bdf7918f197e21c113e5bf25355f0006115 SHA512 8c98ddaf7050dbe9f511dd053310911f64a2e3b3f2a07822617e7e292c43a5a4ace6126d65e3e4c43bd439111842bf56761bd19baaf33ff2555e64c4882a00d2
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild
deleted file mode 100644
index 673d2903e9bf..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild
deleted file mode 100644
index 5d8cc7d42a46..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild
deleted file mode 100644
index 9d697a0365e1..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/metadata.xml b/gnustep-base/gnustep-back-xlib/metadata.xml
deleted file mode 100644
index 51a634514545..000000000000
--- a/gnustep-base/gnustep-back-xlib/metadata.xml
+++ /dev/null
@@ -1,28 +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>
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This package installs a backend that supports X11.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-base-1.24.9-r1 b/gnustep-base/gnustep-base-1.24.9-r1
new file mode 100644
index 000000000000..6f6b8dd84683
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.24.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi libressl +ssl zeroconf debug doc
+KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cfba48ef92474789ce84881a4d624ccc
diff --git a/gnustep-base/gnustep-base-1.25.0 b/gnustep-base/gnustep-base-1.25.0
new file mode 100644
index 000000000000..899d1550b822
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi zeroconf debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=69da8251556012a251cca6208f7dab1c
diff --git a/gnustep-base/gnustep-base-1.25.1 b/gnustep-base/gnustep-base-1.25.1
new file mode 100644
index 000000000000..8a94d5867388
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi zeroconf debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=59ad8d0384bfa271b7404a3ad6f579c3
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
deleted file mode 100644
index 4b77f78d664b..000000000000
--- a/gnustep-base/gnustep-base/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-base-1.24.9.tar.gz 3561094 BLAKE2B a50e92ae774826082e743581425cfaab6bcbcdbf65a88df4d58988d3c6723e5d3d76d09cf57b4f9278c489e2ff0d178257e2be1c7147a284d8624f3629aaf4f4 SHA512 baaa3541edf48a5d902f706f9dad261378bf65e5d89f7308ece6a1fe55c348506df4b6d474ae17cdf0072f1e8dec1b2050d59413abe28bd001d5717c54a3ab96
-DIST gnustep-base-1.25.0.tar.gz 3528599 BLAKE2B aa86de9dc26fb48f49bdd796fc25863e8b1baa48a7c8a1536cc39497843b8d37f02e1cc72ea343795d1be6392a6679a4810ae62e6f9c5ec6c34f9ee099f32746 SHA512 0c38baa439a87557e054e37ed7b337e9f90f349fd6683551cf6482a0a53c247e2ca23b7df9ab369e8819a7d0f9f29e8a8dc639b148ec1c0223764796dbbd3608
-DIST gnustep-base-1.25.1.tar.gz 3475169 BLAKE2B 4e2d26ad5782e117f778d298add4c92d40f7c6c73d5aff9692d8eaf7cf06d6ccf6487282e03d4f86bb434d0c7c327b3d80187ca43fdc1c0ff282a246958448fc SHA512 a93c3b4c0fb7df4946ed52dc62c11dfa58f8606fc9666cc7ec7ff5e1c088b67608410b715680e801636bf5ce2caa08e172372f6cab94933459c5e870f962ab11
-EBUILD gnustep-base-1.24.9-r1.ebuild 2372 BLAKE2B ad96ec102bdc01ebad822bb68e640047267d8384d9cf12d0f6fb1ef73ee0bfc9a9b2555ade8d6c6e1e948e2466d916acc4c01749ba74c30d5dcfba7c6b4a410c SHA512 fa11cb04e89b3d85753d5a36166338071c5969c1d8d465b13c1faa92b4eae8071fefb5bdb501e8a886c8bb35a584b41bf6cfa7c62759a38fe374068613cecec9
-EBUILD gnustep-base-1.25.0.ebuild 1898 BLAKE2B 0729b8c6785906f253ac4238c27ca4f8d8bf23933bafd57db227355d3fa940c44a64941e09723bb8bc4803e09d6cb83881735c6645f55043f3bf8d8b6b53f8f4 SHA512 6607de4027ef9771cb31d676a25674df505ab5d99082d18cd6f0b54136ced56ea0660be83255223df6d77e6c8869eaa12e26e84ee84e5032a6c1f9a5a4fb1504
-EBUILD gnustep-base-1.25.1.ebuild 1898 BLAKE2B 4ba1e0639713300c8627c3c25b6684cb5c2286b30f118623a6217be2715006d2005c41bf43665fcd4cd7fcff6194762b11073afc391b47a897e58496a859d8f8 SHA512 b4758ae27ff9366dbcf85f228f29bd7f721cbdcab5c4a358e8f5b7ba0da19ac6cfc1cc2bd14c1be1d3d206323f0d46bd384d1ffcd33b3279e814e30df840960f
-MISC metadata.xml 763 BLAKE2B 471a69f26f594d1081fcd22568ca563d6a8a3fb37c6aeead77e91805de28d2c652d0ebc7a4d9364440008ed563a083eefd1e2c9311ef9f0e95152f8ff8a7c93e SHA512 1adb2cc47580c492a91b7593731b7cd8763cd3d2e45945229346afebc2840be93855e8f62158d59663a49c775e3482bf142a3ef52e087696f7bbc8bc429178b3
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
deleted file mode 100644
index 33bda7c7ebe8..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf="$myconf --enable-tls --disable-openssl"
-		else
-			myconf="$myconf --disable-tls --enable-openssl"
-		fi
-	else
-		myconf="$myconf --disable-tls --disable-openssl"
-	fi
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild
deleted file mode 100644
index c4443e1e8360..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	gnutls? ( net-libs/gnutls )
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	myconf="$myconf $(use_enable gnutls tls)"
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild
deleted file mode 100644
index 997dca9002cb..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	gnutls? ( net-libs/gnutls )
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	myconf="$myconf $(use_enable gnutls tls)"
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
deleted file mode 100644
index b036c9f7a481..000000000000
--- a/gnustep-base/gnustep-base/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>
-The GNUstep Base Library is a library of general-purpose, non-graphical
-Objective C objects.  For example, it includes classes for strings,
-object collections, byte streams, typed coders, invocations,
-notifications, notification dispatchers, moments in time, network ports,
-remote object messaging support (distributed objects), and event loops.
-
-It provides functionality that aims to implement the non-graphical
-portion of the OpenStep standard (the Foundation library).
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-gui-0.25.0 b/gnustep-base/gnustep-gui-0.25.0
new file mode 100644
index 000000000000..b5bacd24856a
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=947833ba0736a8d4bb6f8b8ac21c38a2
diff --git a/gnustep-base/gnustep-gui-0.25.1 b/gnustep-base/gnustep-gui-0.25.1
new file mode 100644
index 000000000000..4fd5fd29b483
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5d139aa74123fb61f53707d9487ba8d9
diff --git a/gnustep-base/gnustep-gui-0.26.2 b/gnustep-base/gnustep-gui-0.26.2
new file mode 100644
index 000000000000..974c11144f30
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.25.1[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.25.1[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1bffb887a912ca6101e0cbce56e058b3
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
deleted file mode 100644
index 7cb97b5b382e..000000000000
--- a/gnustep-base/gnustep-gui/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-gui-0.25.0.tar.gz 2882556 BLAKE2B 65ac762c5dcc0419d275f2418de695131f87df804350c93dfbcde3a33d7ddd3038b1a4a1fdef2a4b0bfce2a75d21b5b5b46b6837830d701884324ae3bd394b7d SHA512 568c0c9160febbd9bc563bfc7fbec024bc583a2d6ccfb54e527630f1e761a51f57f984a8b83f06cab97f85e3eec183386057fed2d551a383a16cecb60f102dc2
-DIST gnustep-gui-0.25.1.tar.gz 2888779 BLAKE2B 4d11442660b746e4667d3472dadebff93768254efbd8b7548230c5c0df6d4727d582e720ffbd61a5e79ca89735eb104ff7a88dede5932569b2c1d111a30540db SHA512 d69416c471d4f2fc9971e4aaddc5471b13854d00be6e03b78c3e89f9e7f90285c9024fc6992811296434d5dadf8ac02bcb69a1ceaa1c651461f83778165328e8
-DIST gnustep-gui-0.26.2.tar.gz 2860931 BLAKE2B f597901e3a8d3f2d9a334cdcb7f1c89d15555761dc6f99d80ae56bca3b2be553abbadc6f3616f98d45f50efe4accb7f8cd119aad1a5a7ad019572fbf0c65d9df SHA512 165106d96e933b101ca13cc8643c13626165cb2a49794b34a0e898b288c24b9c7e68115362bd363518f0abf2b21341a0746e2d331f320ab0a0685209f3406800
-EBUILD gnustep-gui-0.25.0.ebuild 1344 BLAKE2B 6568823d327771acc64d4861bc0502f429a02b0bef419d619090e1a52d5131066218a69d17f9114e72ca1a9371a2adba15471af61662083c1bf41c5f48444e8c SHA512 700179d830a7584ea9882163c936a15cfef4f72ec69303d4e867ff415c7d1aa7d38700cc19579e9b3622861824825faec419b2373d877f63db23ac85d7540bfd
-EBUILD gnustep-gui-0.25.1.ebuild 1348 BLAKE2B d7b36aaa47ae8d816bfa7c2a0f46aa30ddae9d00a1017b02cb287b68e37dd5bc38891ff2cb5558dccfcf050ac5cb39f2af61939b82fe9ff88900d566ec65c320 SHA512 838eefe948c7d73ceed6f64984d2d4e14758e4172aac9a587a88fbba909e591ef95cc05d5d95e1494629e99a782c5e93cb04c47bc46cd2f061c6380ac339a33e
-EBUILD gnustep-gui-0.26.2.ebuild 1348 BLAKE2B 9d7cd725f72f8cc70ef17fb6f3e427d25bc79134059f608a3f827d5e4ac99a59511a3e31550238470f1b1ecf72a057b136937d364556a5551274442dd13a6b69 SHA512 231447c67b5048a66ba9c1f05e3180a50f4f7d3bdb60954009b5fbed9bf1b3ea87cffd7dd2eedb9b9825773a0bfdd078d081e07e6d8acf1c305a77f58e5d5fdd
-MISC metadata.xml 1544 BLAKE2B 1a590eccc9a65316966873ab9517de3798d31ffbcc19ac864665a6f96289e8483e9b05cd38d32a611de6bcafedc205ef8616214632368ba7a15e2a7793f461d6 SHA512 1c7a16c090c18044752d1033f1884b4ac49ced4f0cc97903b9c3a0b037f06072e291a9d02fd4855682233196b120b60344fedf978049a29ef9c44f0546beea4e
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild
deleted file mode 100644
index b761a2ce1839..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.24.9[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild
deleted file mode 100644
index 6fc6b5e6daf5..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.24.9[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild
deleted file mode 100644
index 73bb0ab26e64..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.25.1[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/metadata.xml b/gnustep-base/gnustep-gui/metadata.xml
deleted file mode 100644
index 4317e4f815c3..000000000000
--- a/gnustep-base/gnustep-gui/metadata.xml
+++ /dev/null
@@ -1,33 +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>
-<use>
-	<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
-</use>
-<longdescription>
-It is a library of graphical user interface classes written completely
-in the Objective-C language; the classes are based upon the OpenStep
-specification as release by NeXT Software, Inc.  The library has been
-enhanced in a number of ways to take advantage of the GNU system.
-These classes include graphical objects such as buttons, text fields,
-popup lists, browser lists, and windows; there are also many associated
-classes for handling events, colors, fonts, pasteboards and images.
-
-The GNUstep GUI Library is designed in two parts.  The first part is
-the front-end component which is independent of platform and display
-system.  This front-end is combined with a back-end component which
-handles all of the display system dependent such as specific calls to
-X/Windows.  This design allows the GNUstep applications to have the
-"look and feel" of the underlying display system without any changes to
-the application, and the library can be easily ported to other display
-systems.
-
-The GNUstep GUI Library requires the GNU Objective-C compiler, the
-GNUstep Base Library, the TIFF Graphics library, and a back-end
-component like the GNUstep 'Back' Backend.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-make-2.6.8 b/gnustep-base/gnustep-make-2.6.8
new file mode 100644
index 000000000000..e8394029db0e
--- /dev/null
+++ b/gnustep-base/gnustep-make-2.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+DESCRIPTION=GNUstep Makefile Package
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=libobjc2 native-exceptions debug doc
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50cc2b54fb8d1063c2aa5ecd59f1692f
diff --git a/gnustep-base/gnustep-make-2.7.0 b/gnustep-base/gnustep-make-2.7.0
new file mode 100644
index 000000000000..534a219802eb
--- /dev/null
+++ b/gnustep-base/gnustep-make-2.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+DESCRIPTION=GNUstep Makefile Package
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=libobjc2 native-exceptions debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=466a28387d2642a7b76e6aad39b0fcfe
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
deleted file mode 100644
index db96eff17853..000000000000
--- a/gnustep-base/gnustep-make/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gnustep-5.csh 348 BLAKE2B 5a53bd83fffbba5db434c90c1b527cf32697b87ad51bf4abdaf09a843a211c4c52b81c2d2d65772847f1d5eb16e82a2561b6d24fde1efb7709766315261e8a9c SHA512 6345bd8559ead4e8433f9e7d3f85412b4cd155188a8daffb6c99c00257c1a5af89fd492fde53e819b887be19f4ebbdb09ae74428fe492c39256a6b476f073209
-AUX gnustep-5.sh 359 BLAKE2B 2df675c570e6343b3303cb3c82e0eb6c6fe60f842fe61297b147acca485df93b8a5a5ecc235b0e3a9854c0fb25cb06c2fcac34ee75933157fc8c230ac94ca843 SHA512 ceb39b583e7583bc6715723878eff1c06685b4786c9607f3ef581ef230a755efd80c7b18202458d4af54bac01c0ff2f5cec443d8c87639c6cdffc7604bb07700
-DIST gnustep-make-2.6.8.tar.gz 592266 BLAKE2B 12ad6d1b27f3280f99c55d78a899983527620fbb6ec9a7d70bd71917e0d615e62d4930ceb39c3ea3d340749896226a528d18d322629e05cba3a6f636be4b0a47 SHA512 1df6757cd1e0dbca3eb6e4ad4346406799ebb2782f5853014cc3b1e8ae47056026e6c5cd43e5671c8802232444602fde164dde352c15b4e0d64bdfdea06bd8a0
-DIST gnustep-make-2.7.0.tar.gz 596399 BLAKE2B 85c23795bbaaa7ca3a2166d96a1bc6be3506501721ee5bee4fa8513c490affabce7d4f60a13ba3b33f642c73f08afb4e30ba48da4d1b3bcfd17df3ec9b85b8b6 SHA512 7a39c2c79f01c3a93607bba71ef8c482d0610541ebcb3d0ffce6c1a104a74646329d18255a8bd183ccf54f37018e4d6b4a9d8adf419e2cdea29b35c89e81d9a2
-EBUILD gnustep-make-2.6.8.ebuild 3791 BLAKE2B 9ad51d1b31b01aad1b06a0292a744aca86fa1cfd34461e801948a59cca294057e5d92ba7df63eb5404aec0fda03e0bf1b506a4fb40a805ca3a95dd01b6843a4e SHA512 42d7571285d9e9507248a4d46dbeb4d5d17a52bd6fedd015800c239c4026fc1433c3724d7662a3c9df4b82855319f2a85705f3cdc35bacb84cfaece504875a52
-EBUILD gnustep-make-2.7.0.ebuild 3796 BLAKE2B b16ebf072f7ea1ac88bf916f75081a0f89ecab31c7cd0751d1025e27f669f859dd8ae82520970bdc9414638635a01be47cc97d26945d1f8983bd26ecb18b0551 SHA512 cf9ff5bad0bf4f58293f3872d24a71aa0aa4af53a2e9f0a33b176f18d59b2fe718316796515cc394d2cececdaf7004e022931a365e5bec81be21598bad550361
-MISC metadata.xml 991 BLAKE2B 757d5e30738a28bb29dad429845961458f9c66fc4f081504ae72a4e32da2f7a776bdd55e166a3346a4ae7d74cdb452e31dafd74ac466dfc3d7226978b0a7ca6c SHA512 3167eb855a813fa42c61c74fdd4aab284a1273b97d20783afcebd952df53577c4f644917ef0182f1fe436c1aa6e81461fcde315b2b5a45f1dc26110fa411fe27
diff --git a/gnustep-base/gnustep-make/files/gnustep-5.csh b/gnustep-base/gnustep-make/files/gnustep-5.csh
deleted file mode 100644
index 4b7102094187..000000000000
--- a/gnustep-base/gnustep-make/files/gnustep-5.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env csh
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Test for an interactive shell
-if ( $?prompt ) then
-	setenv GNUSTEP_SYSTEM_TOOLS "@GENTOO_PORTAGE_EPREFIX@"/usr/bin
-
-	if ( -x $GNUSTEP_SYSTEM_TOOLS/make_services ) then
-		$GNUSTEP_SYSTEM_TOOLS/make_services
-	endif
-endif
diff --git a/gnustep-base/gnustep-make/files/gnustep-5.sh b/gnustep-base/gnustep-make/files/gnustep-5.sh
deleted file mode 100644
index f5e07549cff8..000000000000
--- a/gnustep-base/gnustep-make/files/gnustep-5.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env sh
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Test for an interactive shell
-case $- in
-	*i*)
-	;;
-	*)
-		return
-	;;
-esac
-	
-GNUSTEP_SYSTEM_TOOLS="@GENTOO_PORTAGE_EPREFIX@"/usr/bin
-
-if [ -x ${GNUSTEP_SYSTEM_TOOLS}/make_services ]; then
-    ${GNUSTEP_SYSTEM_TOOLS}/make_services
-fi
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
deleted file mode 100644
index 414a690bff16..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base prefix toolchain-funcs
-
-DESCRIPTION="GNUstep Makefile Package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libobjc2 native-exceptions"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	libobjc2? ( gnustep-base/libobjc2
-		sys-devel/clang )
-	!libobjc2? ( !!gnustep-base/libobjc2
-		|| (
-			>=sys-devel/gcc-3.3[objc]
-			sys-devel/clang
-		) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Determine libobjc.so to use
-	if use libobjc2; then
-		libobjc_version=libobjc.so.4
-	else
-		# Find version in active gcc
-		for ver in {2..5};
-		do
-			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
-				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
-			then
-				libobjc_version=libobjc.so.${ver}
-			fi
-		done
-	fi
-
-	# Stop if we could not get libobjc.so
-	if [[ -z ${libobjc_version} ]]; then
-		eerror "${P} requires a working Objective-C runtime and a compiler with"
-		eerror "Objective-C support. Your current settings lack these requirements"
-		if ! use libobjc2;
-		then
-			eerror "Please switch your active compiler to gcc with USE=objc, or clang"
-		fi
-		die "Could not find Objective-C runtime"
-	fi
-
-	# For existing installations, determine if we will use another libobjc.so
-	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
-		# Old installations did not set this explicitely
-		: ${current_libobjc:=libobjc.so.2}
-
-		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
-			ewarn "Warning: changed libobjc.so version!!"
-			ewarn "The libobjc.so version used for gnustep-make has changed"
-			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
-			ewarn "You must rebuild all gnustep packages installed."
-			ewarn ""
-			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
-			ewarn "# gnustep-updater -l"
-		fi
-	fi
-
-	if use libobjc2; then
-		export CC=clang
-	fi
-}
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-5.{csh,sh}
-
-	default
-}
-
-src_configure() {
-	#--enable-objc-nonfragile-abi: only working in clang for now
-	econf \
-		INSTALL="${EPREFIX}"/usr/bin/install \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		--with-objc-lib-flag=-l:${libobjc_version} \
-		$(use_enable libobjc2 objc-nonfragile-abi) \
-		$(use_enable native-exceptions native-objc-exceptions)
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		emake -C Documentation
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install
-
-	# Copy the documentation
-	if use doc ; then
-		emake -C Documentation ${make_eval} DESTDIR="${D}" install
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-?.sh
-	doexe "${T}"/gnustep-?.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild
deleted file mode 100644
index 0ba4fc2bebf3..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base prefix toolchain-funcs
-
-DESCRIPTION="GNUstep Makefile Package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libobjc2 native-exceptions"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	libobjc2? ( gnustep-base/libobjc2
-		sys-devel/clang )
-	!libobjc2? ( !!gnustep-base/libobjc2
-		|| (
-			>=sys-devel/gcc-3.3[objc]
-			sys-devel/clang
-		) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Determine libobjc.so to use
-	if use libobjc2; then
-		libobjc_version=libobjc.so.4
-	else
-		# Find version in active gcc
-		for ver in {2..5};
-		do
-			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
-				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
-			then
-				libobjc_version=libobjc.so.${ver}
-			fi
-		done
-	fi
-
-	# Stop if we could not get libobjc.so
-	if [[ -z ${libobjc_version} ]]; then
-		eerror "${P} requires a working Objective-C runtime and a compiler with"
-		eerror "Objective-C support. Your current settings lack these requirements"
-		if ! use libobjc2;
-		then
-			eerror "Please switch your active compiler to gcc with USE=objc, or clang"
-		fi
-		die "Could not find Objective-C runtime"
-	fi
-
-	# For existing installations, determine if we will use another libobjc.so
-	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
-		# Old installations did not set this explicitely
-		: ${current_libobjc:=libobjc.so.2}
-
-		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
-			ewarn "Warning: changed libobjc.so version!!"
-			ewarn "The libobjc.so version used for gnustep-make has changed"
-			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
-			ewarn "You must rebuild all gnustep packages installed."
-			ewarn ""
-			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
-			ewarn "# gnustep-updater -l"
-		fi
-	fi
-
-	if use libobjc2; then
-		export CC=clang
-	fi
-}
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-5.{csh,sh}
-
-	default
-}
-
-src_configure() {
-	#--enable-objc-nonfragile-abi: only working in clang for now
-	econf \
-		INSTALL="${EPREFIX}"/usr/bin/install \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		--with-objc-lib-flag=-l:${libobjc_version} \
-		$(use_enable libobjc2 objc-nonfragile-abi) \
-		$(use_enable native-exceptions native-objc-exceptions)
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		emake -C Documentation
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install
-
-	# Copy the documentation
-	if use doc ; then
-		emake -C Documentation ${make_eval} DESTDIR="${D}" install
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-?.sh
-	doexe "${T}"/gnustep-?.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
deleted file mode 100644
index b8baaa59a863..000000000000
--- a/gnustep-base/gnustep-make/metadata.xml
+++ /dev/null
@@ -1,19 +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 makefile package is a simple, powerful and extensible way to write
-makefiles for a GNUstep-based project.  It allows the user to write a
-project without having to deal with the complex issues associated with
-configuration, building, installation, and packaging.  It also allows
-the user to easily create cross-compiled binaries.
-</longdescription>
-<use>
-	<flag name="libobjc2">Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with non-fragile ABI and <pkg>sys-devel/clang</pkg> compiler</flag>
-	<flag name="native-exceptions">Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it </flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-updater-0.2 b/gnustep-base/gnustep-updater-0.2
new file mode 100644
index 000000000000..81ec012ee49b
--- /dev/null
+++ b/gnustep-base/gnustep-updater-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash
+DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
+EAPI=4
+HOMEPAGE=https://www.gentoo.org
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.2.tar.bz2
+_md5_=5adc7236593c6b6a89b0eb98090370a2
diff --git a/gnustep-base/gnustep-updater-0.3 b/gnustep-base/gnustep-updater-0.3
new file mode 100644
index 000000000000..055ebeff2b6d
--- /dev/null
+++ b/gnustep-base/gnustep-updater-0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash
+DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
+EAPI=4
+HOMEPAGE=https://www.gentoo.org
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
+_md5_=56eb250cdf6686901369fab4202a1e47
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
deleted file mode 100644
index 465dfe2ec985..000000000000
--- a/gnustep-base/gnustep-updater/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnustep-updater-0.2.tar.bz2 3523 BLAKE2B 781f5e090f1dc2aec8c477017066ec8b5dfd00d228329506fb27ecbb5da6cdd7fcda2468ddf879ede910c2d8b329326e1bd87e578b6cbf990c0e70c145840cc8 SHA512 8e543a42bc68b6cf57e59987822528ab23067632f54b6277be7e8723aa24bd10556d75aac88f474e811b491e55b0882b84eb392972d58ed69bfc22011bdf575e
-DIST gnustep-updater-0.3.tar.bz2 3685 BLAKE2B df4d4e54243e0ffaa2ba28c71eefb7107b1cec59574f69ba4587a76a759d33d68c4d06250160b97814ef2c00e6e628664c30c760ad1fc3c9ac0c035451b5520a SHA512 079b51c54a7860c4eea65ffc63172ea69e88de4a34f2ca0d0c5ad3a1342ea37ee69edb107f287f04d33c3ee03658edd5386d1323f47e9bc201bc70d68d0c9c4b
-EBUILD gnustep-updater-0.2.ebuild 591 BLAKE2B bc5779fcb6c792582a50885222b498d8663ab56cbdf45c633531311e0f384dfcb39978e3fd37dddc573a0eb33ca8faaa19d99af5e89e9bee31c890257921340d SHA512 d33f4b2e91caf735461c266d8a2cea4ff6d3aae33f325c7997ef7853aeda611c3583afeb40d677ef5f7d85ea072826e41264e3488b66e00d2e0a6adbd8796198
-EBUILD gnustep-updater-0.3.ebuild 592 BLAKE2B 41cc7d8838b95d604edecca5665b6aec9dd4d86998de5fc6410e6ecd0bee60fa2a0304e8206b13b69a7b610288ab514fa5d77420988e2c87adb95970b629e912 SHA512 cf7d5d8189c66d80d527af90508980c3d79eec395a211c3db215b8c82ea9382e317223f386bc1fc95acfc3a743975e82e312e7a2a5f12effb7b652546a1617f5
-MISC metadata.xml 391 BLAKE2B bd0dd26138078e5a04f3a55ee560af0a2ac353c47af2d043ca28cdc55912d0445925f7a0b3691a13a2eca1735ae00573ba7c8d6b4c210b5217451c743e5d782e SHA512 3f5fbaa301d779e176d67686228b59a3130197055577bbfb2c15703ed63b5f8c40f7edadfd0cc06ae1e08d320161fcc399af4e3886b127e40ec562ecc19a0b0c
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
deleted file mode 100644
index acdb6f8c3ab9..000000000000
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.2.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
-
-DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	>=gnustep-base/gnustep-make-2.6.0"
-
-src_install() {
-	dosbin gnustep-updater
-	doman gnustep-updater.1
-}
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
deleted file mode 100644
index b64bbf5e8a64..000000000000
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3.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
-
-DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	>=gnustep-base/gnustep-make-2.6.0"
-
-src_install() {
-	dosbin gnustep-updater
-	doman gnustep-updater.1
-}
diff --git a/gnustep-base/gnustep-updater/metadata.xml b/gnustep-base/gnustep-updater/metadata.xml
deleted file mode 100644
index b01c639deaa1..000000000000
--- a/gnustep-base/gnustep-updater/metadata.xml
+++ /dev/null
@@ -1,10 +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>Helper tool to upgrade Gentoo GNUstep installations, after
-		the switch to FHS layout for example</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/libobjc2-1.8 b/gnustep-base/libobjc2-1.8
new file mode 100644
index 000000000000..6b70b5110691
--- /dev/null
+++ b/gnustep-base/libobjc2-1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/clang-2.9 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNUstep Objective-C runtime
+EAPI=5
+HOMEPAGE=http://www.gnustep.org
+IUSE=boehm-gc cxx test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+SLOT=0
+SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.tar.gz -> libobjc2-1.8.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/gnustep-base/libobjc2-1.8.1 b/gnustep-base/libobjc2-1.8.1
new file mode 100644
index 000000000000..967c6364788d
--- /dev/null
+++ b/gnustep-base/libobjc2-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/clang-2.9 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNUstep Objective-C runtime
+EAPI=5
+HOMEPAGE=http://www.gnustep.org
+IUSE=boehm-gc cxx test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+SLOT=0
+SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.1.tar.gz -> libobjc2-1.8.1.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
deleted file mode 100644
index dcbe88c07f23..000000000000
--- a/gnustep-base/libobjc2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libobjc2-1.7-fix_soname.patch 1827 BLAKE2B fa716ca39eaa0cb78214922ed5bfac139d1ba1f510791938ffcbad2c1a5c096b04056cda1f25baf3ade2b37d0757516c14a9ac2c77684438852ddf38b11d9e09 SHA512 d6ce4a6840e7f3ea22db3f63574a08fe9fad2fd3ebeaac764097935b322f038baa4ec9d0f19124dd84cb6ffe010e267bdb60f76f5d24dd508f520bdb38124ead
-DIST libobjc2-1.8.1.tar.gz 173635 BLAKE2B 1ed9df6ee934a56dd8565904f9a402f5687bac6f876bcef538fed60c4ebd34af8f35921bdabbdf1ad97fb371e591aea3e47170afaffe65056af07c88e01f0b37 SHA512 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
-DIST libobjc2-1.8.tar.gz 173512 BLAKE2B ba494dd2db2bfdcc2cfce906014d75146368f049ebe4ea6b83024705af2b78f916252a084b95be43c245c5fd6574d00db75853d291193ea70cc48a6b5dbeab93 SHA512 1562e42dc43a24c1655d02db7aa101a48a7b026bec23252c8eec3893fbac0d67368685291df0954ee79f07b92ecc13c68ee7c7b0f351428a31e99ed05ed2230d
-EBUILD libobjc2-1.8.1.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
-EBUILD libobjc2-1.8.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
-MISC metadata.xml 1348 BLAKE2B b5eec1f6af50d0a90d62c6dce21fe14b6c20ec7d534ac49030bbc89bb2f5665af7d40750386f84d3aedb67802807e25ad04f824c7b6908e41a3de256c07dead3 SHA512 5adcc9a3d5527c5e86da2ae7884f334d68ebd884b26e9f0d3329af7c877921c90bef4f77d8c535c82102e3bacb5a199e5fd940471036004f66858850040ee936
diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
deleted file mode 100644
index ba1aa8ecea91..000000000000
--- a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt
---- libobjc2-1.7.orig/CMakeLists.txt	2013-06-27 13:30:41.000000000 +0200
-+++ libobjc2-1.7/CMakeLists.txt	2015-05-20 13:20:55.214244088 +0200
-@@ -8,7 +8,8 @@
- set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
- set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
- 
--set(libobjc_VERSION 4.6)
-+set(libobjc_SOVERSION 4)
-+set(libobjc_VERSION 4.6.0)
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
- # Build configuration
-@@ -204,7 +205,8 @@
- 			add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 			set_target_properties(objcxx PROPERTIES
- 				LINKER_LANGUAGE C
--				SOVERSION ${libobjc_VERSION}
-+            SOVERSION ${libobjc_SOVERSION}
-+            VERSION ${libobjc_VERSION}
- 				)
- 			target_link_libraries(objcxx ${CXX_RUNTIME})
- 			set(CXX_RUNTIME "")
-@@ -220,7 +222,8 @@
- 		add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 		set_target_properties(objcxx PROPERTIES
- 			LINKER_LANGUAGE C
--			SOVERSION ${libobjc_VERSION}
-+         SOVERSION ${libobjc_SOVERSION}
-+         VERSION ${libobjc_VERSION}
- 			)
- 		set(CXX_RUNTIME "")
- 		list(APPEND INSTALL_TARGETS objcxx)
-@@ -241,7 +244,8 @@
- 
- set_target_properties(objc PROPERTIES
- 	LINKER_LANGUAGE C
--	SOVERSION ${libobjc_VERSION}
-+   SOVERSION ${libobjc_SOVERSION}
-+   VERSION ${libobjc_VERSION}
- 	OUTPUT_NAME ${LIBOBJC_NAME}
- 	LINK_FLAGS "${objc_LINK_FLAGS}"
- 	)
-@@ -349,3 +353,14 @@
- 	add_subdirectory(Test)
- endif (TESTS)
- 
-+
-+MESSAGE(STATUS "<<< Gentoo configuration >>>
-+Build type      ${CMAKE_BUILD_TYPE}
-+Install path    ${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C               ${CMAKE_C_FLAGS}
-+C++             ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable      ${CMAKE_EXE_LINKER_FLAGS}
-+Module          ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
deleted file mode 100644
index a6d1aa123871..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
deleted file mode 100644
index a6d1aa123871..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
deleted file mode 100644
index b347a3b63481..000000000000
--- a/gnustep-base/libobjc2/metadata.xml
+++ /dev/null
@@ -1,33 +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 GNUstep Objective-C runtime is designed as a drop-in replacement for the
-		GCC runtime.  It supports both a legacy and a modern ABI, allowing code
-		compiled with old versions of GCC to be supported without requiring
-		recompilation.  The modern ABI adds the following features:
-		- Non-fragile instance variables.
-		- Protocol uniquing.
-		- Object planes support.
-		- Declared property introspection.
-
-		Both ABIs support the following feature above and beyond the GCC runtime:
-		- The modern Objective-C runtime APIs, introduced with OS X 10.5.
-		- Blocks (closures).
-		- Low memory profile for platforms where memory usage is more important than speed.
-		- Synthesised property accessors.
-		- Efficient support for @synchronized()
-		- Type-dependent dispatch, eliminating stack corruption from mismatched selectors.
-	</longdescription>
-	<use>
-		<flag name="boehm-gc">Enable Hans Boehm's garbage collector
-		(<pkg>dev-libs/boehm-gc</pkg>). Not recommended by upstream</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">gnustep/libobjc2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-base/metadata.xml b/gnustep-base/metadata.xml
deleted file mode 100644
index cdf763f14e4c..000000000000
--- a/gnustep-base/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-base category contains GNUstep base packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnustep-base enthält die Basispakete der
-		GNUstep-Umgebung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnustep-base contiene los paquetes base de GNUstep.
-	</longdescription>
-	<longdescription lang="ja">
-		gnustep-baseカテゴリーにはGNUstepのベース・パッケージが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De gnustep-base categorie bevat de basispakketten van GNUstep.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnustep-base chứa các ứng dụng GNUstep cơ bản.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnustep-base contiene i pacchetti base di GNUstep.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnustep-base contém os pacotes de base de GNUstep.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnustep-base zawiera podstawowe pakiety GNUstep.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnustep-base/mknfonts-0.5-r2 b/gnustep-base/mknfonts-0.5-r2
new file mode 100644
index 000000000000..b2d7d2fb9fd8
--- /dev/null
+++ b/gnustep-base/mknfonts-0.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
+EAPI=6
+HOMEPAGE=https://packages.debian.org/mknfonts.tool
+IUSE=debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c52c08fb14eaf384b7d8c6e7c0d42ee4
diff --git a/gnustep-base/mknfonts-0.5-r3 b/gnustep-base/mknfonts-0.5-r3
new file mode 100644
index 000000000000..d9062d4c7dc8
--- /dev/null
+++ b/gnustep-base/mknfonts-0.5-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1 virtual/pkgconfig
+DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
+EAPI=7
+HOMEPAGE=https://packages.debian.org/mknfonts.tool
+IUSE=debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
+_eclasses_=eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8ec6611ca86e07e9066235020f2bd86b
diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
deleted file mode 100644
index 270e0c841b26..000000000000
--- a/gnustep-base/mknfonts/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mknfonts-0.5-pkgconfig.patch 510 BLAKE2B b74790dbad72f52c0075114861ecbb66a428c41cda8510252e41611a57a16eaff34461f18d87659bce469167e28d75bcfe20fdf5b5419acb2b5d12416236f506 SHA512 c45b6eb60365cb6b0125127cfaf9292756a5f6490249f5fa5be600054ec4743f84bd1c56e9d199441e74de829a4ebf63241c4aae5e13a64af449a1ec4ba6a00f
-AUX mknfonts-rename.patch 499 BLAKE2B 50430871a2f4a99bf1c4996291dadacf1bf6cbd296b1ae5ef25d896a7d48d034ea2fbfc91f5f490661d0ba3c5b87ead5794a4402104e670c090ac654c117c5c0 SHA512 9107b0e6de1d228bce2e4796dd69a65a5644ca290dbe7c2953f44576d5485204bb52659895302e243d2f92bb3dbdf33991cbfa62a59d2486914b62a8e4675f7f
-DIST mknfonts.tool_0.5.orig.tar.gz 2890 BLAKE2B 584989b90c0fb44d62f69174e0dca706a8bcfab942442228ae4e5c98dfb8221e9bfc43cb32b4f48609b51ff7217f591f2d7acaccf219a2ed34b99fb9f5ea2f4e SHA512 a6ad5810576285f16a8dc3596205b64bc6b183a6b9377df1c9e40d28cdba7ce2ae6e6b883478429f8c931bdd3f9f23396c6f5cd3fa1d155025638bb77ccd86ed
-EBUILD mknfonts-0.5-r2.ebuild 739 BLAKE2B 8ab135c1c469b872477d59f2692ad42ef8297c7955fc4c2ebba1e9667804a63bc6212fe65777b91ce88b8d6a2dfab4d155c5f28176d125815e6d9b6672ef8614 SHA512 69da2c1eaaa4ac84be7d0ee8f2a168895ef28ebf02b4f7f44a36e59bef2552133950120c350e6ca5eb72ee82171f27d483b9183851717422c13642e198abb6ba
-EBUILD mknfonts-0.5-r3.ebuild 787 BLAKE2B d700765e5b44ee42c607435db7e0d2c4c807668f18d6fbaaa1d0f03d8873309a41a10642c22f5865fa6824c5833a785a6676125b8c28884ee6e172c01f9fdcbc SHA512 dd962aac428abca33a4797a6b4a5f61e15b9014a54928744f297057f5bd482a16422b64479e88fe1abbd6dfee23eaaab77d26fa21b11455c942ffed5333dd79d
-MISC metadata.xml 386 BLAKE2B 9e51e731459b36cc9d7b65926248bd40c8e8461659b126cf302101221043916d50de5240435e8ec1fa242f63ecd0c8e628c24f45c9228c0019edd3b2e6db8668 SHA512 de1d2ee898b37b1ae1d2d2763d13275bb9c733065588ec367f5505ff3a027f3ee965ec02b7c3709ce7946b9afe3860a02933a12e57064fe6f30ee51c7455a533
diff --git a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
deleted file mode 100644
index e73bac5c1ddf..000000000000
--- a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mknfonts-0.5.orig/GNUmakefile mknfonts-0.5/GNUmakefile
---- mknfonts-0.5.orig/GNUmakefile	2002-09-28 12:27:26.000000000 +0200
-+++ mknfonts-0.5/GNUmakefile	2018-06-29 11:27:01.871588321 +0200
-@@ -9,8 +9,8 @@
- 
- ADDITIONAL_OBJCFLAGS += -Wall -O2
- 
--ADDITIONAL_INCLUDE_DIRS += `freetype-config --cflags`
--ADDITIONAL_LDFLAGS += `freetype-config --libs`
-+ADDITIONAL_INCLUDE_DIRS += `pkg-config --cflags freetype2`
-+ADDITIONAL_LDFLAGS += `pkg-config --libs freetype2`
- 
- mknfonts_OBJC_FILES = mknfonts.m
- 
diff --git a/gnustep-base/mknfonts/files/mknfonts-rename.patch b/gnustep-base/mknfonts/files/mknfonts-rename.patch
deleted file mode 100644
index e62618b7844c..000000000000
--- a/gnustep-base/mknfonts/files/mknfonts-rename.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mknfonts-0.5/mknfonts.m.orig	2007-05-03 11:46:27.000000000 +0200
-+++ mknfonts-0.5/mknfonts.m	2007-05-03 11:47:34.000000000 +0200
-@@ -310,12 +310,6 @@
- 			{
- 				fi=[faceinfos objectAtIndex: i];
- 				[faces addObject: [fi faceInfoDictionary]];
--				for (j=0;j<[fi->files count];j++)
--				{
--					[fm movePath: [fi->files objectAtIndex: j]
--						toPath: [path stringByAppendingPathComponent: [[fi->files objectAtIndex: j] lastPathComponent]]
--						handler: nil];
--				}
- 			}
- 
- 			[family_info
diff --git a/gnustep-base/mknfonts/metadata.xml b/gnustep-base/mknfonts/metadata.xml
deleted file mode 100644
index 7fc083dde574..000000000000
--- a/gnustep-base/mknfonts/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>
-mknfonts is a tool that offers ease of creating new font sets for the gnustep-back-art package.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
deleted file mode 100644
index b4e3d0b21090..000000000000
--- a/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
-HOMEPAGE="https://packages.debian.org/mknfonts.tool"
-SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-DEPEND="gnustep-base/gnustep-gui
-	>=media-libs/freetype-2.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-rename.patch )
-
-src_prepare() {
-	# Correct link command for --as-needed
-	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
-
-	default
-}
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
deleted file mode 100644
index af4957771143..000000000000
--- a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnustep-base
-
-DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
-HOMEPAGE="https://packages.debian.org/mknfonts.tool"
-SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="gnustep-base/gnustep-gui
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-rename.patch
-	"${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	# Correct link command for --as-needed
-	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die
-}