Merge updates from master

author: Repository mirror & CI <repomirrorci@gentoo.org> 2018-07-28 12:04:08 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2018-07-28 12:04:08 +0000
commit: 4b4a05f860b135ab82a9179d471764154b0e4287 (patch)
tree: dfc8b310c9a915164f3e49ec1019365cc5ddfaad
parent: 2018-07-28 11:44:24 UTC (diff)
parent: app-misc/wyrd: Remove last-rited pkg (diff)
download: gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.tar.gz
gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.tar.bz2
gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.zip
127 files changed, 2 insertions, 6512 deletions
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/Manifest b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
deleted file mode 100644
index 02a488c55e65..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gentoo-mirror.asc.20180203.gz 3054 BLAKE2B 4904aee11e80aaab7113356eba5aa8fcaced960b253bf5ba40addc6e4026fa7342319517af3549e902c547d42775fffd8713f1873ac9685d5dfe0207655bbfa5 SHA512 429e1226c535b1c3e0a87b471bf03a6c216086a5d801f77b5061b8f00b44a597e5569b5be58ca3a01aaa2d18c1e323532587e7403ab5ef51d718690d0bad2059
-DIST gentoo-mirror.asc.20180528.gz 5954 BLAKE2B 4942ac019249a6fe0c03a4cd33b472b2df82faabb8df1bba9af61dd12d52a5059a5c3ffc20f8c3cd8c5b20d24fd110f4dc0d9f11aaaa439cf07985842c993f40 SHA512 b0856f7ee62798e7b259bba17d7ee63a3bc5c78bbe901d0a45d951f47c1cc435a6b21812bf4287cb45520061713ec1885bfc07e5c2baf76c17a2d3f2584f1685
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
deleted file mode 100644
index fc597b55ac39..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
deleted file mode 100644
index fc597b55ac39..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
deleted file mode 100644
index 4be20b1e94d4..000000000000
--- a/app-doc/mkdoxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
diff --git a/app-doc/mkdoxy/metadata.xml b/app-doc/mkdoxy/metadata.xml
deleted file mode 100644
index 04567741bc34..000000000000
--- a/app-doc/mkdoxy/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-needed -->
-	<longdescription>
-		A doxygen-style documentation tool for makefiles (requires doxygen).
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mkdoxy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
deleted file mode 100644
index 7241ac00ff6b..000000000000
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="mkDoxy generates Doxygen-compatible HTML documentation for makefiles"
-HOMEPAGE="https://sourceforge.net/projects/mkdoxy/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-	>=dev-lang/perl-5"
-
-src_install() {
-	dobin mkdoxy
-	dodoc AUTHORS ChangeLog INSTALL INSTALL.gentoo README TODO VERSION
-}
diff --git a/app-i18n/ibus-tutcode/Manifest b/app-i18n/ibus-tutcode/Manifest
deleted file mode 100644
index cff87393e0ef..000000000000
--- a/app-i18n/ibus-tutcode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ibus-tutcode-1.0.2.tar.bz2 217894 BLAKE2B b1140e14845e99b1b6a908c7783eef210f928c9281fa924acebef80677ea2b0f6947015aa7c5d64f94ca0147737cb42dbc2c09e61df904505444da8cf93c50d9 SHA512 f7845323396d24a3097cf475c8fa40890b923434e551b8941a6f4cb4d84a4aed7d7b293295ba515603131a8e03a99d58b19dc3d81a7ee13d8d7d904edb5ece02
diff --git a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
deleted file mode 100644
index b39c6bbfb76b..000000000000
--- a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="a Japanese TUT-Code input engine for IBus"
-HOMEPAGE="https://github.com/deton/ibus-tutcode/"
-SRC_URI="mirror://github/deton/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	>=sys-devel/gettext-0.16.1"
-DEPEND="${CDEPEND}
-	test? ( app-i18n/ibus )"
-RDEPEND="${CDEPEND}
-	app-i18n/ibus"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	sed -i -e "s/python/${EPYTHON}/" engine/ibus-engine-tutcode.in || die
-}
-
-src_install() {
-	default
-	dodoc ${PN}.json.example
-}
diff --git a/app-i18n/ibus-tutcode/metadata.xml b/app-i18n/ibus-tutcode/metadata.xml
deleted file mode 100644
index 07c7706e43ff..000000000000
--- a/app-i18n/ibus-tutcode/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="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">deton/ibus-tutcode</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/wyrd/Manifest b/app-misc/wyrd/Manifest
deleted file mode 100644
index 3898a4b3df66..000000000000
--- a/app-misc/wyrd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wyrd-1.4.6.tar.gz 425829 BLAKE2B f732b0d69ebb200913f51ab5ea1d42f551469ebd4bc4fd22862499a01db6a6a5bfc21caac7b14e7bf247b75b73a64c3d7ed7c9249d0bc4123a6fc1a27d5017db SHA512 fc09c4567ea8d6225638ee6851ddab716665913b7d7b2f6b5a3cc7f2af9144df617e2a95ca78c74874bec3ff355aba028c7c51eafe1426d9ae803ab77ce84477
diff --git a/app-misc/wyrd/metadata.xml b/app-misc/wyrd/metadata.xml
deleted file mode 100644
index 4920b59165e4..000000000000
--- a/app-misc/wyrd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Wyrd is a text-based front-end to Remind, a sophisticated calendar and alarm
-		program. Remind's power lies in its programmability, and Wyrd does not hide this
-		capability behind flashy GUI dialogs. Rather, Wyrd is designed to make you more
-		efficient at editing your reminder files directly. It also offers a scrollable
-		timetable suitable for visualizing your schedule at a glance.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-misc/wyrd/wyrd-1.4.6-r1.ebuild b/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
deleted file mode 100644
index 531160d57311..000000000000
--- a/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Text-based front-end to Remind"
-HOMEPAGE="http://pessimization.com/software/wyrd/"
-SRC_URI="http://pessimization.com/software/wyrd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="unicode"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	>=app-misc/remind-03.01
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.08
-"
-
-src_configure() {
-	econf \
-		$(use_enable unicode utf8)
-}
-
-src_install() {
-	export STRIP_MASK="/usr/bin/wyrd"
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog
-	dohtml doc/manual.html
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
index b0b8ccb85838..e004fcd9dff9 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND="virtual/libmysqlclient:=
diff --git a/games-arcade/marbleblast-demo/Manifest b/games-arcade/marbleblast-demo/Manifest
deleted file mode 100644
index 03920d58ac7a..000000000000
--- a/games-arcade/marbleblast-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MarbleBlastDemo-1.3.sh.bin 10800892 BLAKE2B 87fe4ae6f07365f2ed3cc6f6c4006c9a7ca4f8bdcd07cc0a20a5f575130c65666edab45ad6ff191ced8d29556c3e2c662d93b0d4938de8a3571af04698cae66b SHA512 24bd5f03c8868ab83e2bcfe27ab60f86727e972f04cafe4d5ff940a77adf4a362c3de1b0391b5763aed8dc946af7b769da60654b2ea53133521b200a99ebdde8
diff --git a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild b/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
deleted file mode 100644
index a99f38dc06b0..000000000000
--- a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker games
-
-DESCRIPTION="race marbles through crazy stages"
-HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=3"
-SRC_URI="ftp://ggdev-1.homelan.com/marbleblast/MarbleBlastDemo-${PV}.sh.bin"
-
-LICENSE="MARBLEBLAST"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/marbleblastdemo.bin
-	${dir:1}/lib/lib*"
-
-src_install() {
-	dodir "${dir}" "${GAMES_BINDIR}"
-
-	tar -zxf MarbleBlast.tar.gz -C "${D}/${dir}" || die "extracting MarbleBlast.tar.gz"
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/marbleblastdemo
-	dosym "${dir}"/marbleblastdemo "${GAMES_BINDIR}"/marbleblast-demo
-
-	dodoc README_DEMO.txt
-
-	prepgamesdirs
-}
diff --git a/games-arcade/marbleblast-demo/metadata.xml b/games-arcade/marbleblast-demo/metadata.xml
deleted file mode 100644
index 581d9cab5924..000000000000
--- a/games-arcade/marbleblast-demo/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Marble Blast is an arcade action game with simple yet addictive gameplay, 
-suitable for players of any age. In the rich cartoon landscape of Marble 
-Blast, players will race their marbles through moving platforms, dangerous 
-hazards, sparkling treasures and power up enhancements in an effort to 
-complete each course in record time.
-
-Marble Blast introduces new players to the game with a set of 
-progressively more difficult beginner training levels, each designed to 
-showcase a power up or game hazard. The hazards players will face in 
-Marble Blast include powerful fans, whirling tornados, land mines, 
-pinball-style bumpers, narrow catwalks, moving pistons, dizzying chasms, 
-and more.
-
-To get past these obstacles, players can find and use five different 
-ability enhancing power ups - the SuperSpeed, SuperJump, SuperBounce, 
-Shock Asbsorber and Gyrocopter. Some levels contain gravity modifiers, 
-which allow the player to change the direction of gravity.
-
-Marble Blast comes with 72 whimsical and challenging levels, as well as 
-the ability for advanced players to craft and share their own levels. 
-Marble Blast is sure to provide many hours of fun for the whole family.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/marbleblastgold-demo/Manifest b/games-arcade/marbleblastgold-demo/Manifest
deleted file mode 100644
index 7e769038e345..000000000000
--- a/games-arcade/marbleblastgold-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MarbleBlastGoldDemo-1.4.1.sh.bin 11180534 BLAKE2B 1b0b1fca99bf7bdbb4beb5572d4ec10c634a6dffe8ce1576452011f1283196cd983adbb4d01b9c24590bd97cd2f9145bb67007cb76f0867335c8f4fc8f3e7d7e SHA512 16f03cdcf3cd6440048d8640c2a91078637d018f15a49764eca914259d65196f5a16a90abc11283d0e4b9af1b290d7ab880e96caae2dd6c813ac6d3d8414ec2c
diff --git a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild b/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
deleted file mode 100644
index db76c45ef6a0..000000000000
--- a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker games
-
-DESCRIPTION="race marbles through crazy stages"
-HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=15"
-SRC_URI="ftp://ggdev-1.homelan.com/marbleblastgold/MarbleBlastGoldDemo-${PV}.sh.bin"
-
-LICENSE="MARBLEBLAST"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/marbleblastgolddemo.bin
-	${dir:1}/lib/*"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "${dir}" "${GAMES_BINDIR}"
-
-	tar -zxf MarbleBlast.tar.gz -C "${D}/${dir}" || die "extracting MarbleBlast.tar.gz"
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/marbleblastgolddemo
-	dosym "${dir}"/marbleblastgolddemo "${GAMES_BINDIR}"/marbleblastgold-demo
-
-	insinto "${dir}"
-	doins MarbleBlast.xpm
-
-	dodoc README.txt
-
-	prepgamesdirs
-}
diff --git a/games-arcade/marbleblastgold-demo/metadata.xml b/games-arcade/marbleblastgold-demo/metadata.xml
deleted file mode 100644
index 9b3bdd524a91..000000000000
--- a/games-arcade/marbleblastgold-demo/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Marble Blast Gold is an arcade action game with simple yet 
-addictive gameplay, suitable for players of any age. In the 
-rich cartoon landscape of Marble Blast Gold, players will race 
-their marbles through moving platforms, dangerous hazards, 
-sparkling treasures and power up enhancements in an effort to 
-complete each course in record time.
-
-Marble Blast Gold introduces new players to the game with a set 
-of progressively more difficult beginner training levels, each 
-designed to showcase a power up or game hazard. The hazards 
-players will face in Marble Blast include powerful fans, 
-whirling tornados, land mines, pinball-style bumpers, narrow 
-catwalks, moving pistons, dizzying chasms, and more.
-
-To get past these obstacles, players can find and use five 
-different ability enhancing power ups - the SuperSpeed, 
-SuperJump, SuperBounce, Shock Absorber and Gyrocopter. Some 
-levels contain gravity modifiers, which allow the player to 
-change the direction of gravity.
-
-Marble Blast Gold comes with 100 whimsical and challenging 
-levels, as well as the ability for advanced players to craft 
-and share their own levels. Each level has "gold standard" set 
-for the high score, so you can test your skills against the 
-record 'gold' times. Marble Blast Gold is sure to provide many 
-hours of fun for the whole family.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/skystreets/Manifest b/games-arcade/skystreets/Manifest
deleted file mode 100644
index 98bdea4cf090..000000000000
--- a/games-arcade/skystreets/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skystreets-0.2.4.tar.bz2 1838860 BLAKE2B b52af4fc799b4ab7063030c6281faa0cae66c9a64c3f6797ad8907f5ba72fa7dcb0bc4db8c21260464f4af4aca2e91c06277913117997c36edd538ae2a0b149e SHA512 b27ac359f3f4e187aa3fa6d576574301baee56a90a7502b10976924b7def95a65adac47940637b02467ad3902df981e33871cfb7f81e583f478b7319e6baafe6
diff --git a/games-arcade/skystreets/files/0.2.4-gl.patch b/games-arcade/skystreets/files/0.2.4-gl.patch
deleted file mode 100644
index 6ff5548a5fa3..000000000000
--- a/games-arcade/skystreets/files/0.2.4-gl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- game.cpp.old	2004-12-31 01:02:13.351382184 +1100
-+++ game.cpp	2004-12-31 01:02:26.415396152 +1100
-@@ -8,6 +8,7 @@
- #include <windows.h>
- #endif
- 
-+#define GL_GLEXT_PROTOTYPES 1
- #include <GL/gl.h>
- #include "SDL.h"
- #include <string.h>
diff --git a/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch b/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch
deleted file mode 100644
index 414cd3d61ce4..000000000000
--- a/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2009-02-02 18:04:04.000000000 +0100
-+++ Makefile.in	2009-02-02 18:04:37.000000000 +0100
-@@ -78,7 +78,7 @@
- EXTRA_DIST = *.h CODE BUGS
- INCLUDES = `sdl-config --cflags` -Wall -O2 -DDATAPATH=\"$(pkgdatadir)\"
- #LDFLAGS = -lSDL_image -lm
--LDFLAGS = -lSDL_image -lGL -lGLU -lm
-+LDADD = -lSDL_image -lGL -lGLU -lm
- # LDFLAGS = `sdl-config --libs` -lSDL_image -lm
- SUBDIRS = audio gfx levels
- AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/games-arcade/skystreets/metadata.xml b/games-arcade/skystreets/metadata.xml
deleted file mode 100644
index 47eeb6f42b45..000000000000
--- a/games-arcade/skystreets/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">skystreets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/skystreets/skystreets-0.2.4.ebuild b/games-arcade/skystreets/skystreets-0.2.4.ebuild
deleted file mode 100644
index 405cb2fa532b..000000000000
--- a/games-arcade/skystreets/skystreets-0.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A remake of the old DOS game Skyroads"
-HOMEPAGE="http://freecode.com/projects/skystreets"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-image"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gl.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_install() {
-	default
-	newicon gfx/sunscene.png ${PN}.png
-	make_desktop_entry ${PN} SkyStreets
-	prepgamesdirs
-}
diff --git a/games-emulation/gfceux/Manifest b/games-emulation/gfceux/Manifest
deleted file mode 100644
index 089a0e891068..000000000000
--- a/games-emulation/gfceux/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fceux-2.1.1.src.tar.bz2 3263945 BLAKE2B 96c1dfcf51f34eff273c948d7467c4c5503079423d839c6e52596f5a47bb7a2c148a1603fbd784d838c62476e71818418615f4d10f9d04669d319466b379f078 SHA512 19a1253a3ff1d88baec5636dbebab287b106e5e114081ab4040f52dfcda28b878af748a759e08dc2fe1381eb8f59e728d36993a9aca9ce184ed8760114cf3149
diff --git a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild b/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
deleted file mode 100644
index faf11fdaf183..000000000000
--- a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils distutils-r1 games
-
-DESCRIPTION="A graphical frontend for the FCEUX emulator"
-HOMEPAGE="http://fceux.com"
-SRC_URI="mirror://sourceforge/fceultra/fceux-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}
-	games-emulation/fceux"
-
-S=${WORKDIR}/${PN}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i \
-		-e "s#data/gfceux.glade#${GAMES_DATADIR}/${PN}/gfceux.glade#" \
-		src/main.py || die
-}
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doicon -s 48 data/${PN}.png
-	newicon -s 128 data/${PN}_big.png ${PN}.png
-
-	# respect games variables
-	dodir "${GAMES_DATADIR}"/${PN}
-	mv "${ED}"/usr/share/${PN}/* "${ED}${GAMES_DATADIR}"/${PN}/ || die
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/gfceux/metadata.xml b/games-emulation/gfceux/metadata.xml
deleted file mode 100644
index 3c71f364aead..000000000000
--- a/games-emulation/gfceux/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fceultra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/hugo/Manifest b/games-emulation/hugo/Manifest
deleted file mode 100644
index 63d9702b176f..000000000000
--- a/games-emulation/hugo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hugo-2.12.tar.gz 456991 BLAKE2B 21bcb1fbab1020cbc26039b0f9a49ef653ee21409c84a61747940437dd57c39a453772dbbf82d3e74b18b477ed6a505402108fb1969e56279b650a734b91a40b SHA512 38342e6e7a130caeac711de4f72138a5159c2a34e443ce5e16bcb7ac02fbefd085fa5c48583550d8089bfe3528785853df1863e7d1b32652a7f88300ad09d21d
diff --git a/games-emulation/hugo/files/hugo-2.12-gcc41.patch b/games-emulation/hugo/files/hugo-2.12-gcc41.patch
deleted file mode 100644
index 14050cc79f16..000000000000
--- a/games-emulation/hugo/files/hugo-2.12-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pce.h.old	2006-05-02 20:06:13.000000000 +0200
-+++ pce.h	2006-05-02 20:06:33.000000000 +0200
-@@ -196,7 +196,7 @@
- extern UChar language;
- // the current language
- 
--extern int BaseClock, UPeriod;
-+extern int UPeriod;
- 
- extern UChar US_encoded_card;
- // Do we have to swap even and odd bytes in the rom
diff --git a/games-emulation/hugo/hugo-2.12.ebuild b/games-emulation/hugo/hugo-2.12.ebuild
deleted file mode 100644
index 86bcffd6e456..000000000000
--- a/games-emulation/hugo/hugo-2.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-DESCRIPTION="PC-Engine (Turbografx16) emulator for linux"
-HOMEPAGE="http://www.zeograd.com/"
-SRC_URI="http://www.zeograd.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libsdl[video]
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	append-cppflags $(pkg-config sdl --cflags)
-
-}
-
-src_install() {
-	dogamesbin hugo
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r pixmaps
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*html
-	prepgamesdirs
-}
diff --git a/games-emulation/hugo/metadata.xml b/games-emulation/hugo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/hugo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/kigb/Manifest b/games-emulation/kigb/Manifest
deleted file mode 100644
index 44ef4a4b4dff..000000000000
--- a/games-emulation/kigb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kigb_lin.tar.gz 477324 BLAKE2B 4e15c77bd5a0e1ff0740bd6af53548e54c3dfc7d27ba07290201d11793e38015f12266e169969511f3852cf8742055ea491ce57213e7aefde5ed8b99b1f2e985 SHA512 ca8b10cc05884c92157dde2b034c7e95f28ed7eed771d0383265f942f0cacea791284516b551e96ba07a035068a7039c8faa19ec417ee117b6a350692bbff01d
diff --git a/games-emulation/kigb/files/kigb b/games-emulation/kigb/files/kigb
deleted file mode 100644
index c07095bb53ee..000000000000
--- a/games-emulation/kigb/files/kigb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-kigb_dir="${HOME}/.kigb"
-
-if [[ ! -d "${kigb_dir}" ]] ; then
-	mkdir -p "${kigb_dir}"
-	cd "${kigb_dir}"
-	mkdir cfg inp rom save snap state
-	ln -s GENTOODIR/kigb/kigb kigb
-fi
-
-cd "${kigb_dir}"
-exec ./kigb "$@"
diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild
deleted file mode 100644
index bbccc19ef464..000000000000
--- a/games-emulation/kigb/kigb-2.02.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="A Gameboy (GB, SGB, GBA) Emulator for Linux"
-HOMEPAGE="http://kigb.emuunlim.com/"
-SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="x11-libs/libXext
-	sys-libs/zlib
-	dev-games/hawknl
-	=virtual/libstdc++-3*"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# use the system version
-	rm -f libNL.so*
-	# wrapper script creates these in the users' home directories.
-	rm -rf cfg inp snap state rom save
-	cp "${FILESDIR}/kigb" "${T}/" || die
-	sed -i \
-		-e "s:GENTOODIR:${GAMES_PREFIX_OPT}:" "${T}/kigb" || die
-}
-
-src_install() {
-	dogamesbin "${T}/kigb"
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
-	doexe kigb
-	dodoc doc/*
-	prepgamesdirs
-}
diff --git a/games-emulation/kigb/metadata.xml b/games-emulation/kigb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/kigb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/raine/Manifest b/games-emulation/raine/Manifest
deleted file mode 100644
index d8890ff335b3..000000000000
--- a/games-emulation/raine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST raines-0.51.9.tar.bz2 2095980 BLAKE2B df83e0869229fc832e356d5cd122c737bfafe3b4ee8b8914cb14e30b9f48b97145123f989e36a2a01243bc62d2f49f50e5e43f2da2a433751410f72a23edd315 SHA512 e21346d72c63d8ba1bc6832bd885fa9ec0865c788742e572ef9941d3a4fd3f23710d076253d7a50878ef512ff3024e57098c0ba28c0c794bdefa994b8b7780bf
diff --git a/games-emulation/raine/files/raine-0.51.9-ldflags.patch b/games-emulation/raine/files/raine-0.51.9-ldflags.patch
deleted file mode 100644
index f011cd6a1e5c..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2010-10-08 10:04:46.000000000 +0200
-+++ makefile	2010-10-08 10:05:25.000000000 +0200
-@@ -995,7 +995,7 @@
- else
- 	@echo Linking Raine...
- endif
--	$(LDV) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
-+	$(LDV) $(LDFLAGS) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
- 
- converter: source/bonus/converter.c
- 	$(CCV) $(CFLAGS) -c $< -o $(OBJDIR)/converter.o
diff --git a/games-emulation/raine/files/raine-0.51.9-libpng15.patch b/games-emulation/raine/files/raine-0.51.9-libpng15.patch
deleted file mode 100644
index 675df24801dc..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/388255
-
---- source/savepng.c
-+++ source/savepng.c
-@@ -203,7 +203,7 @@
- 	goto Error;
- 
-     /* Set error handling. */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* If we get here, we had a problem reading the file. */
- 	goto Error;
-     }
diff --git a/games-emulation/raine/files/raine-0.51.9-underlink.patch b/games-emulation/raine/files/raine-0.51.9-underlink.patch
deleted file mode 100644
index e9eb42bedbb3..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2011-06-16 08:25:35.000000000 +0200
-+++ makefile	2011-06-16 08:25:57.000000000 +0200
-@@ -294,7 +294,7 @@
-    LIBS_DEBUG = -lz `allegro-config --libs ` `libpng-config --ldflags` 
-    LIBS_STATIC = -lz `allegro-config --static` `libpng-config --static --ldflags`
- else
--   LIBS = -lz `libpng-config --ldflags` 
-+   LIBS = -lz -lm `libpng-config --ldflags` 
-    LIBS_DEBUG = -lz `libpng-config --ldflags`
-    LIBS_STATIC = -lz `libpng-config --static --ldflags`
- endif
diff --git a/games-emulation/raine/metadata.xml b/games-emulation/raine/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/raine/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/raine/raine-0.51.9.ebuild b/games-emulation/raine/raine-0.51.9.ebuild
deleted file mode 100644
index 5aaef97c6506..000000000000
--- a/games-emulation/raine/raine-0.51.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils games
-
-DESCRIPTION="R A I N E  M680x0 Arcade Emulation"
-HOMEPAGE="http://rainemu.swishparty.co.uk/"
-SRC_URI="http://rainemu.swishparty.co.uk/html/archive/raines-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/muParser
-	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-src_prepare() {
-	echo > detect-cpu
-	echo > cpuinfo
-	sed -i \
-		-e "/^NEO/s:^:#:" \
-		-e "s:nasmw:nasm:" \
-		-e "/bindir/s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/sharedir =/s:=.*:=\$(DESTDIR)${GAMES_DATADIR}:" \
-		-e "/mandir/s:=.*:=\$(DESTDIR)/usr/share/man/man6:" \
-		makefile || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
-		sed -i -e '1i#define OF(x) x' source/mini-unzip/ioapi.h
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_compile() {
-	local myopts
-
-	emake \
-		_MARCH="${CFLAGS}" \
-		VERBOSE=1 \
-		${myopts}
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{roms,artwork,emudx,scripts/raine}
-	dodoc docs/readme.txt
-	prepgamesdirs
-}
diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
deleted file mode 100644
index fafb92e7fb70..000000000000
--- a/games-fps/aaquake2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
-DIST quake2-ref_softaa-0.1.tar.gz 12931 BLAKE2B b20644662b903e7604f53283008b54c86e83e7b1dd6b66a505bbaa41fdfaa3c783cbb73d320418595498b54ddc2f72e94d53096bc82cb173be9fcdd192dee2b9 SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
deleted file mode 100644
index a7aa57c721bd..000000000000
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="text mode Quake II"
-HOMEPAGE="https://www.jfedor.org/aaquake2/"
-SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
-	https://www.jfedor.org/aaquake2/quake2-ref_softaa-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="media-libs/aalib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/quake2-3.21/linux
-
-src_prepare() {
-	cd .. && epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc41.patch
-	cd "${S}" && epatch \
-		"${FILESDIR}"/${P}-glibc.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-}
-
-src_compile() {
-	mkdir -p releasei386-glibc/ref_soft
-	emake -j1 \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
-}
-
-src_install() {
-	cd release* || die
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softaa.so
-	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_softx.so
-	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_soft.so
-	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-
-	newgamesbin quake2 aaquake2
-
-	insinto "${GAMES_SYSCONFDIR}"
-	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
-	doins ${PN}.conf
-
-	prepgamesdirs
-}
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
deleted file mode 100644
index cc7bb1733f64..000000000000
--- a/games-fps/aaquake2/files/0.1-gentoo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- linux/Makefile.old
-+++ linux/Makefile
-@@ -54,7 +54,7 @@
- RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- else
--RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
-@@ -92,7 +92,7 @@
- #############################################################################
- 
- ifeq ($(ARCH),axp)
--TARGETS=$(BUILDDIR)/q2ded \
-+TARGETS=\
- 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
- 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
-@@ -100,11 +100,7 @@
- else
- TARGETS=$(BUILDDIR)/quake2 \
- 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
--	$(BUILDDIR)/ref_soft.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_softx.$(SHLIBEXT) \
- 	$(BUILDDIR)/ref_softaa.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_gl.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_glx.$(SHLIBEXT) \
- 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT)
-@@ -125,9 +121,6 @@
- build_release:
- 	@-mkdir $(BUILD_RELEASE_DIR) \
- 		$(BUILD_RELEASE_DIR)/client \
--		$(BUILD_RELEASE_DIR)/ded \
--		$(BUILD_RELEASE_DIR)/ref_soft \
--		$(BUILD_RELEASE_DIR)/ref_gl \
- 		$(BUILD_RELEASE_DIR)/game \
- 		$(BUILD_RELEASE_DIR)/ctf \
- #		$(BUILD_RELEASE_DIR)/xatrix \
---- linux/sys_linux.c.old
-+++ linux/sys_linux.c
-@@ -220,7 +220,7 @@
- 	char	curpath[MAX_OSPATH];
- 	char	*path;
- #ifdef __i386__
--	const char *gamename = "gamei386.so";
-+	const char *gamename = "GENTOO_DIR/gamei386.so";
- #elif defined __alpha__
- 	const char *gamename = "gameaxp.so";
- #else
-@@ -250,6 +250,14 @@
- 		{
- 			Com_Printf ("LoadLibrary (%s)\n",name);
- 			break;
-+		} else {
-+			sprintf (name, "%s", gamename);
-+			game_library = dlopen (name, RTLD_LAZY );
-+			if (game_library)
-+			{
-+				Com_Printf ("LoadLibrary (%s)\n",name);
-+				break;
-+			}
- 		}
- 	}
- 
---- qcommon/files.c.old
-+++ qcommon/files.c
-@@ -865,7 +865,7 @@
- 	//
- 	// start up with baseq2 by default
- 	//
--	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
-+	FS_AddGameDirectory (va(BASEDIRNAME) );
- 
- 	// any set gamedirs will be freed up to here
- 	fs_base_searchpaths = fs_searchpaths;
---- qcommon/qcommon.h.old
-+++ qcommon/qcommon.h
-@@ -25,7 +25,7 @@
- 
- #define	VERSION		3.21
- 
--#define	BASEDIRNAME	"baseq2"
-+#define	BASEDIRNAME	GENTOO_DATADIR
- 
- #ifdef WIN32
- 
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
deleted file mode 100644
index bb2e8e5979e5..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- game/g_local.h.old
-+++ game/g_local.h
-@@ -458,11 +458,6 @@
- extern	int	sm_meat_index;
- extern	int	snd_fry;
- 
--extern	int	jacket_armor_index;
--extern	int	combat_armor_index;
--extern	int	body_armor_index;
--
--
- // means of death
- #define MOD_UNKNOWN			0
- #define MOD_BLASTER			1
---- ctf/g_local.h.old
-+++ ctf/g_local.h
-@@ -466,11 +466,6 @@
- extern	int	sm_meat_index;
- extern	int	snd_fry;
- 
--extern	int	jacket_armor_index;
--extern	int	combat_armor_index;
--extern	int	body_armor_index;
--
--
- // means of death
- #define MOD_UNKNOWN			0
- #define MOD_BLASTER			1
-@@ -556,10 +556,6 @@
- 
- extern	cvar_t	*sv_maplist;
- 
--//ZOID
--extern	qboolean	is_quad;
--//ZOID
--
- #define world	(&g_edicts[0])
- 
- // item spawnflags
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
deleted file mode 100644
index 638e91b2c393..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- rw_aa.c.old
-+++ rw_aa.c
-@@ -61,7 +61,7 @@
- #include <signal.h>
- #include <sys/mman.h>
- 
--#include <asm/io.h>
-+#include <sys/io.h>
- 
- #include <aalib.h>
- 
---- rw_in_aa.c.old
-+++ rw_in_aa.c
-@@ -46,7 +46,7 @@
- #include <signal.h>
- #include <sys/mman.h>
- 
--#include <asm/io.h>
-+#include <sys/io.h>
- 
- #include <aalib.h>
- 
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
deleted file mode 100644
index dc2359ac48d7..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- Makefile.old
-+++ Makefile
-@@ -59,7 +59,7 @@
- endif
- 
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
--LDFLAGS=-ldl -lm
-+LDLIBS=-ldl -lm
- SVGALDFLAGS=-lvga -lm
- XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
- AALDFLAGS=-lm -laa
-@@ -195,7 +195,7 @@
- endif
- 
- $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
- 	$(DO_CC)
-@@ -374,7 +374,7 @@
- 	$(BUILDDIR)/ded/cd_null.o
- 
- $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
- 	$(DO_DED_CC)
-@@ -503,7 +503,7 @@
- 	$(BUILDDIR)/game/m_flash.o
- 
- $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
- 
- $(BUILDDIR)/game/g_ai.o :        $(GAME_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -682,7 +682,7 @@
- 	$(BUILDDIR)/ctf/q_shared.o
- 
- $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
- 
- $(BUILDDIR)/ctf/g_ai.o :       $(CTF_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -821,7 +821,7 @@
- 	$(BUILDDIR)/xatrix/q_shared.o
- 
- $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
- 
- $(BUILDDIR)/xatrix/g_ai.o :        $(XATRIX_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -1048,7 +1048,7 @@
- 	$(BUILDDIR)/rogue/q_shared.o
- 
- $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
- 
- $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
- 	$(DO_SHLIB_CC)
-@@ -1291,15 +1291,15 @@
- 	$(BUILDDIR)/ref_soft/rw_in_aa.o
- 
- $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
- 
- $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
- 
- $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_AA_OBJS) $(AALDFLAGS)
- 
- $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
-@@ -1445,10 +1445,10 @@
- 	$(BUILDDIR)/ref_gl/gl_glx.o
- 
- $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
- 
- $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
- 
- $(BUILDDIR)/ref_gl/gl_draw.o :        $(REF_GL_DIR)/gl_draw.c
- 	$(DO_GL_SHLIB_CC)
diff --git a/games-fps/aaquake2/metadata.xml b/games-fps/aaquake2/metadata.xml
deleted file mode 100644
index 0ac912115906..000000000000
--- a/games-fps/aaquake2/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-aaquake2 - Text Mode Quake II
-
-What?
-Just what you heard - text mode Quake II.
-
-Why?
-Why not? You can watch TV in text mode, you can play DVDs in text mode, 
-you can play Quake 1 in text mode. Quake II is the logical next step.
-
-Or, as the author of ttyquake put it, "If you have to ask why, you're 
-not a member of the intended audience." 
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/doomsday-resources/Manifest b/games-fps/doomsday-resources/Manifest
deleted file mode 100644
index 071ceffba8ba..000000000000
--- a/games-fps/doomsday-resources/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jdoom-details.zip 1379495 BLAKE2B 9ab216895ac44431ce39a89a75c00a4b076edf577cb1489f5d6b7050d69664cdd2b74976dcd43152adbf56b49602a063ca18ab121def79248ce1d1e89cab665c SHA512 94f0c29940795368e9ffdb9fad57f0de65a936a90ad6256effe6fbaa72d1ddf45a016bb72431d1603ade84c01036f84b7dc3e739d04e6c33a41bdf50a9b45dce
-DIST jdoom-resource-pack-1.01.zip 23114845 BLAKE2B 42d514a80ffb15adfd505a96e2ef7152ad1d9a2de111f4f00ffbc4f5da514d3901b8a8f64ce3a85daa51b194d696acbc8dd8f953122fb3019bd7c2c459f5e011 SHA512 ec40f3920338040803b7cb3029e6b52352179fe63a1c56bb74ff398e9eca0ae4c7c058213c812644add70b833c26f9a69844c2ae068cdf7d4c7a4f6c9e277636
diff --git a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
deleted file mode 100644
index 884a7ef7f3f1..000000000000
--- a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Improved models & textures for doomsday"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/jdoom-resource-pack-${PV}.zip
-	mirror://sourceforge/deng/jdoom-details.zip"
-
-LICENSE="free-noncomm"		#505636
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-fps/doomsday-1.9.8"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/doomsday/data/jdoom/auto
-	doins data/jDoom/* *.pk3
-
-	# The definitions file cannot be auto-loaded
-	insinto "${GAMES_DATADIR}"/doomsday/defs/jdoom
-	doins defs/jDoom/*
-
-	dodoc *.txt docs/*
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Add the following to the jdoom/doomsday command-line options:"
-	elog "  -def ${GAMES_DATADIR}/doomsday/defs/jdoom/jDRP.ded"
-}
diff --git a/games-fps/doomsday-resources/metadata.xml b/games-fps/doomsday-resources/metadata.xml
deleted file mode 100644
index f2f6b346799c..000000000000
--- a/games-fps/doomsday-resources/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">deng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
deleted file mode 100644
index 234c28062711..000000000000
--- a/games-fps/duke3d/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
-DIST duke3d-20040817.tar.bz2 1509273 BLAKE2B 261ffcce5d3ed68f52e04167c43ae70ccb08818fce8a0790ef333ad1b421d9184e9c9ede7c2e6a5eb73978f384e6439439824ac7da7c4ac2f23ef87820a6c4cc SHA512 a08aa07153458501fb01878769af9797460525015b34d743250e3f04f15ee2dcfbb4110c94c83912ba2435e6d6c48127e2d36c0dc29833e0f6f95e3b925b571c
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
deleted file mode 100644
index e75632b67acc..000000000000
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-fromcvs=0
-inherit unpacker eutils flag-o-matic games
-
-DEMO="3dduke13.zip"
-
-DESCRIPTION="Port of the original Duke Nukem 3D"
-HOMEPAGE="http://icculus.org/projects/duke3d/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	demo? (
-		ftp://ftp.3drealms.com/share/${DEMO}
-		ftp://ftp.planetmirror.com/pub/gameworld/downloads/${DEMO}
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~hppa ~x86"
-IUSE="demo pic perl opengl"
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-sound/timidity++
-	media-sound/timidity-eawpatches
-	perl? ( dev-lang/perl[-ithreads] )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	demo? ( app-arch/unzip )
-	!pic? ( x86? ( dev-lang/nasm ) )"
-
-S=${WORKDIR}/${PN}
-
-use_tf() { use ${1} && echo "true" || echo "false"; }
-
-src_unpack() {
-	unpack ${A}
-	if use demo ; then
-		unpack_zip DN3DSW13.SHR
-	fi
-}
-
-src_prepare() {
-	# configure buildengine
-	cd "${S}/source/buildengine"
-	sed -i \
-		-e "/^useperl := / s:=.*:= $(use_tf perl):" \
-		-e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
-		-e "/^usephysfs := / s:=.*:= false:" \
-		-e 's:-O3::' -e 's: -g : :' \
-		-e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' \
-		Makefile || die
-	epatch "${FILESDIR}/${PV}-endian.patch"
-
-	# configure duke3d
-	cd "${S}/source"
-	# need to sync features with build engine
-	epatch \
-		"${FILESDIR}/${PV}-credits.patch" \
-		"${FILESDIR}/${PV}-duke3d-makefile-opts.patch" \
-		"${FILESDIR}/${PV}-gcc34.patch" \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-noinline.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
-		-e "/^use_physfs := / s:=.*:= false:" \
-		Makefile || die
-	if ! use pic && use x86 ; then
-		sed -i \
-			-e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile || die
-		sed -i \
-			-e '/^#use_asm := /s:#::' Makefile || die
-	fi
-
-	# causes crazy redefine errors with gcc-3.[2-4].x
-	replace-flags -O3 -O2
-	strip-flags #203969
-}
-
-src_compile() {
-	emake -C source/buildengine OPTFLAGS="${CFLAGS}"
-	emake -C source OPTIMIZE="${CFLAGS}"
-}
-
-src_install() {
-	games_make_wrapper duke3d "${GAMES_BINDIR}/duke3d.bin" "${GAMES_DATADIR}/${PN}"
-	newgamesbin source/duke3d duke3d.bin
-
-	dodoc readme.txt
-
-	cd testdata
-	insinto "${GAMES_DATADIR}/${PN}"
-	newins defs.con DEFS.CON
-	newins game.con GAME.CON
-	newins user.con USER.CON
-	newins "${FILESDIR}/network.cfg" network.cfg.template
-	if use demo ; then
-		doins "${WORKDIR}/DUKE3D.GRP"
-	fi
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins "${FILESDIR}/duke3d.cfg"
-	dosym "${GAMES_SYSCONFDIR}/duke3d.cfg" "${GAMES_DATADIR}/${PN}/DUKE3D.CFG"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use demo || elog "Put the data files in ${GAMES_DATADIR}/${PN} before playing"
-}
diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch
deleted file mode 100644
index 19eefa4bf423..000000000000
--- a/games-fps/duke3d/files/20040817-credits.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/menues.c	2003-08-17 22:16:10.000000000 +0200
-+++ b/menues.c	2004-03-29 01:59:28.000000000 +0200
-@@ -1747,9 +1747,10 @@
-         case 996:
-         case 997:
- 
--//            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
--//            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
--//            menutext(c,24,0,0,"CREDITS");
-+            c = (320>>1);
-+            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
-+            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
-+            menutext(c,24,0,0,"CREDITS");
- 
-             if(KB_KeyPressed(sc_Escape)) { cmenu(0); break; }
- 
-@@ -1926,6 +1927,21 @@
- 
-             menutext(c,67+16+16+16+16+16,SHX(-7),PHX(-7),"QUIT");
- 
-+    gametext(c,67+16+16+16+16+16+16+16,"Duke Nukem 3D for "
-+#if defined PLATFORM_MACOSX
-+            "MacOS"
-+#elif defined PLATFORM_DOS
-+            "MS-Dos"
-+#elif defined PLATFORM_WIN32
-+            "Win32"
-+#elif defined PLATFORM_UNIX
-+            "Gentoo"
-+#else       
-+            "unknown"
-+#endif      
-+            ,16,2+8+16);
-+    gametext(c,67+16+16+16+16+16+16+16+9,"build " __DATE__ " " __TIME__,16,2+8+16);
-+
-             break;
- // CTW END - MODIFICATION
- 
diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
deleted file mode 100644
index 9ed2a0052153..000000000000
--- a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/Makefile.orig	2003-08-17 17:45:35.948650760 -0400
-+++ b/Makefile	2003-08-17 17:46:36.894385600 -0400
-@@ -4,6 +4,8 @@
- beos := false
- macosx := false
- #use_asm := true
-+use_opengl := true
-+use_physfs := false
- 
- #-----------------------------------------------------------------------------#
- # If this makefile fails to detect Cygwin correctly, or you want to force
-@@ -80,6 +81,10 @@
- 	buildengine/pragmas.o \
- 	buildengine/unix_compat.o
- 
-+ifeq ($(strip $(use_opengl)),true)
-+	BUILDOBJS += buildengine/buildgl.o
-+endif
-+
- ifeq ($(strip $(use_asm)),true)
- 	BUILDOBJS += buildengine/a_gnu.o buildengine/a_nasm.o
- else
-@@ -106,6 +106,10 @@
- 
- LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
- 
-+ifeq ($(strip $(use_physfs)),true)
-+	LDLIBS += -lphysfs
-+endif
-+
- # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
- #LDLIBS += -Wl,-E
- 
diff --git a/games-fps/duke3d/files/20040817-endian.patch b/games-fps/duke3d/files/20040817-endian.patch
deleted file mode 100644
index 3bcdc1379db6..000000000000
--- a/games-fps/duke3d/files/20040817-endian.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- buildengine/platform.h.old	2003-08-07 12:06:17.000000000 +0200
-+++ buildengine/platform.h	2004-08-24 18:35:05.292291088 +0200
-@@ -5,6 +5,7 @@
- #include "win32_compat.h"
- #elif (defined PLATFORM_UNIX)
- #include "unix_compat.h"
-+#include <endian.h>
- #elif (defined PLATFORM_DOS)
- #include "doscmpat.h"
- #else
-@@ -60,9 +61,15 @@
- #define BUILDSWAP_INTEL16(x) _swap16(x)
- #define BUILDSWAP_INTEL32(x) _swap32(x)
- #else
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define PLATFORM_LITTLEENDIAN 1
- #define BUILDSWAP_INTEL16(x) (x)
- #define BUILDSWAP_INTEL32(x) (x)
-+#else
-+#define PLATFORM_BIGENDIAN 1
-+#define BUILDSWAP_INTEL16(x) _swap16(x)
-+#define BUILDSWAP_INTEL32(x) _swap32(x)
-+#endif
- #endif
- 
- extern int has_altivec;  /* PowerPC-specific. */
diff --git a/games-fps/duke3d/files/20040817-gcc34.patch b/games-fps/duke3d/files/20040817-gcc34.patch
deleted file mode 100644
index a7de9c116383..000000000000
--- a/games-fps/duke3d/files/20040817-gcc34.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- source/astub.c.orig	2004-08-22 14:44:50.691126872 +0100
-+++ source/astub.c	2004-08-22 14:47:15.532107696 +0100
-@@ -540,6 +540,11 @@
-         return(tempbuf);
- } //end
- 
-+void SpriteName(short spritenum, char *lo2)
-+{
-+    sprintf(lo2,names[sprite[spritenum].picnum]);
-+}// end SpriteName
-+
- const char *ExtGetSpriteCaption(short spritenum)
- {
- 
-@@ -608,7 +613,11 @@
- //  y1, y2  0-143  (status bar is 144 high, origin is top-left of STATUS BAR)
- //  col     0-15
- 
--
-+void PrintStatus(char *string,int num,char x,char y,char color)
-+{
-+     sprintf(tempbuf,"%s %d",string,num);
-+     printext16(x*8,y*8,color,-1,tempbuf,0);
-+}
- 
- void TotalMem()
- {
-@@ -1276,18 +1285,6 @@
- 
- }
- 
--
--void PrintStatus(char *string,int num,char x,char y,char color)
--{
--     sprintf(tempbuf,"%s %d",string,num);
--     printext16(x*8,y*8,color,-1,tempbuf,0);
--}
--
--void SpriteName(short spritenum, char *lo2)
--{
--    sprintf(lo2,names[sprite[spritenum].picnum]);
--}// end SpriteName
--
- char GAMEpalette[768];
- char WATERpalette[768];
- char SLIMEpalette[768];
-@@ -1326,6 +1323,17 @@
-  ReadGamePalette();
- }// end ReadPaletteTable
- 
-+void Ver()
-+{
-+ sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
-+ if (qsetmode == 200)    //In 3D mode
-+ { printext256(60*8,24*8,11,-1,tempbuf,1);
-+   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
-+ }else
-+ { printext16(0,0,15,-1,tempbuf,0);
-+ }
-+}
-+
- void Keys3d(void)
- {
-     long i,count,rate,nexti;
-@@ -2206,17 +2214,6 @@
-         }
- }
- 
--void Ver()
--{
-- sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
-- if (qsetmode == 200)    //In 3D mode
-- { printext256(60*8,24*8,11,-1,tempbuf,1);
--   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
-- }else
-- { printext16(0,0,15,-1,tempbuf,0);
-- }
--}
--
- ActorMem(int i)
- {int total=0,j;
-     switch(i)
diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
deleted file mode 100644
index c7793a833bf9..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile
---- source/buildengine/Makefile	2004-05-15 05:15:05.000000000 +0200
-+++ source/buildengine/Makefile	2008-02-27 23:10:46.000000000 +0100
-@@ -99,11 +99,11 @@
-   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
-     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
-   else
--    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
-+    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
-   endif
- else
-   SDL_CFLAGS := $(shell sdl-config --cflags)
--  SDL_LDFLAGS := $(shell sdl-config --libs)
-+  SDL_LIBS := $(shell sdl-config --libs)
- endif
- 
- CC = gcc
-@@ -202,7 +202,7 @@
- ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS)
- LINKER = gcc
- CFLAGS += $(USE_ASM) -funsigned-char  -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
--LDFLAGS += $(SDL_LDFLAGS)
-+LDLIBS += $(SDL_LIBS)
- 
- # Rules for turning source files into .o files
- %.o: %.c
-@@ -236,17 +236,17 @@
- 
- ifeq ($(strip $(usedlls)),true)
- $(ENGINEDLL) : $(ENGINEOBJS)
--	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS)
-+	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
- 
- $(NETDLL) : $(NETOBJS)
--	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS)
-+	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
- endif
- 
- $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
--	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(ENGINEDLL) $(NETDLL)
-+	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
- 
- $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
--	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(ENGINEDLL)
-+	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
- 
- listclean:
- 	@echo "A 'make clean' would remove" $(CLEANUP)
-diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile
---- source/Makefile	2004-05-15 05:14:16.000000000 +0200
-+++ source/Makefile	2008-02-27 23:09:57.000000000 +0100
-@@ -45,11 +45,11 @@
-   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
-     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
-   else
--    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
-+    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
-   endif
- else
-   SDL_CFLAGS := $(shell sdl-config --cflags)
--  SDL_LDFLAGS := $(shell sdl-config --libs) -L.
-+  SDL_LIBS := $(shell sdl-config --libs) -L.
- endif
- 
- ifeq ($(strip $(macosx)),true)
-@@ -104,7 +104,7 @@
- #CC = icc
- #CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2
- 
--LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
-+LDLIBS = $(SDL_LIBS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
- 
- # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
- #LDLIBS += -Wl,-E
diff --git a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
deleted file mode 100644
index 3aaf67c6c90b..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
---- source/buildengine/a.c	2004-11-25 13:55:21.000000000 -0500
-+++ source/buildengine/a.c	2005-06-18 18:14:24.000000000 -0400
-@@ -186,7 +186,9 @@
-     if (i3 == 0)
-     {
- 	    i1 += i4;
--	    ((unsigned long)i4) >>= mach3_al;
-+			unsigned long temp = i4;
-+	    temp >>= mach3_al;
-+			i4 = temp;
- 	    i4 = (i4&0xffffff00) | (source[i4]&0xff);
- 	    *dest = ((unsigned char*)i2)[i4];
- 	    return i1;
-diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c
---- source/buildengine/pragmas.c	2003-07-25 20:11:32.000000000 -0400
-+++ source/buildengine/pragmas.c	2005-06-18 18:25:37.000000000 -0400
-@@ -56,28 +56,39 @@
- 
- void clearbufbyte(void *buffer, int size, long fill_value) {
-   int lsize;
-+	unsigned char *p=buffer;
-+	unsigned short *s=buffer;
-   switch(size){
-   case 0: return;
--  case 1: *((unsigned char*)buffer)++ = fill_value; return;
--  case 2: *((unsigned short*)buffer)++ = fill_value; return;
--  case 3: { unsigned char *p=buffer; p[2]=p[1]=p[0] = fill_value;} return;
-+  case 1: *p = fill_value; return;
-+  case 2: *s = fill_value; return;
-+  case 3: { p[2]=p[1]=p[0] = fill_value;} return;
-   default:
- 	if ((int)buffer&1) {
--		*((unsigned char*)buffer)++ = fill_value; size--;
-+		*p = fill_value; ++p; size--;
-+		buffer = p;
- 	}
- 	if ((int)buffer&2) {
--		*((unsigned short*)buffer)++ = fill_value; size-=2;
-+		*s = fill_value; ++s; size-=2;
-+		buffer = s;
- 	}
- 	lsize = size>>2;
-+	unsigned int *up = buffer;
- 	while(lsize) {
--		*((unsigned int*)buffer)++ = fill_value;
-+		*up = fill_value;
-+		++up;
- 		lsize--;
- 	}
-+	buffer = up;
- 	if (size&2) {
--		*((unsigned short*)buffer)++ = fill_value;
-+		s = buffer;
-+		*s = fill_value;
-+		++s;
- 	}
- 	if (size&1) {
--		*((unsigned char*)buffer)++ = fill_value;
-+		p = buffer;
-+		*p = fill_value;
-+		++p;
- 	}
-   }
- }
-@@ -122,7 +133,7 @@
- 	{
- 		*((unsigned short *)source) = ((linum>>16)&0xffff);
- 		linum += linum_inc;
--		((unsigned char*)source) = ((unsigned char*)source) + 2;
-+		source = ((unsigned char*)source) + 2;
- 		size--;
- 		if (size == 0) return;
- 	}
-
-diff -u -r duke3d/source/buildengine/a.h duke3d.gcc4.1.1/source/buildengine/a.h
---- source/buildengine/a.h	2003-04-11 08:54:06.000000000 +0200
-+++ source/buildengine/a.h	2006-06-22 12:14:40.366393568 +0200
-@@ -116,56 +116,56 @@
- 
-   #if ((defined __GNUC__) && (!defined C_IDENTIFIERS_UNDERSCORED))
- 
--    long asm_mmxoverlay(void) __attribute__ ((alias ("_asm_mmxoverlay")));
--    long asm_sethlinesizes(long,long,long) __attribute__ ((alias ("_asm_sethlinesizes")));
--    long asm_setpalookupaddress(char *) __attribute__ ((alias ("_asm_setpalookupaddress")));
--    long asm_setuphlineasm4(long,long) __attribute__ ((alias ("_asm_setuphlineasm4")));
--    long asm_hlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_hlineasm4")));
--    long asm_setuprhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setuprhlineasm4")));
--    long asm_rhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_rhlineasm4")));
--    long asm_setuprmhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setuprmhlineasm4")));
--    long asm_rmhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_rmhlineasm4")));
--    long asm_setupqrhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setupqrhlineasm4")));
--    long asm_qrhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_qrhlineasm4")));
--    long asm_setvlinebpl(long) __attribute__ ((alias ("_asm_setvlinebpl")));
--    long asm_fixtransluscence(long) __attribute__ ((alias ("_asm_fixtransluscence")));
--    long asm_prevlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_prevlineasm1")));
--    long asm_vlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_vlineasm1")));
--    long asm_setuptvlineasm(long) __attribute__ ((alias ("_asm_setuptvlineasm")));
--    long asm_tvlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tvlineasm1")));
--    long asm_setuptvlineasm2(long,long,long) __attribute__ ((alias ("_asm_setuptvlineasm2")));
--    long asm_tvlineasm2(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tvlineasm2")));
--    long asm_mvlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mvlineasm1")));
--    long asm_setupvlineasm(long) __attribute__ ((alias ("_asm_setupvlineasm")));
--    long asm_vlineasm4(long,long) __attribute__ ((alias ("_asm_vlineasm4")));
--    long asm_setupmvlineasm(long) __attribute__ ((alias ("_asm_setupmvlineasm")));
--    long asm_mvlineasm4(long,long) __attribute__ ((alias ("_asm_mvlineasm4")));
--    void asm_setupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setupspritevline")));
--    void asm_spritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_spritevline")));
--    void asm_msetupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_msetupspritevline")));
--    void asm_mspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mspritevline")));
--    void asm_tsetupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tsetupspritevline")));
--    void asm_tspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tspritevline")));
--    long asm_mhline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mhline")));
--    long asm_mhlineskipmodify(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mhlineskipmodify")));
--    long asm_msethlineshift(long,long) __attribute__ ((alias ("_asm_msethlineshift")));
--    long asm_thline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_thline")));
--    long asm_thlineskipmodify(long,long,long,long,long,long) __attribute__ ((alias ("_asm_thlineskipmodify")));
--    long asm_tsethlineshift(long,long) __attribute__ ((alias ("_asm_tsethlineshift")));
--    long asm_setupslopevlin(long,long,long) __attribute__ ((alias ("_asm_setupslopevlin")));
--    long asm_slopevlin(long,long,long,long,long,long) __attribute__ ((alias ("_asm_slopevlin")));
--    long asm_settransnormal(void) __attribute__ ((alias ("_asm_settransnormal")));
--    long asm_settransreverse(void) __attribute__ ((alias ("_asm_settransreverse")));
--    long asm_setupdrawslab(long,long) __attribute__ ((alias ("_asm_setupdrawslab")));
--    long asm_drawslab(long,long,long,long,long,long) __attribute__ ((alias ("_asm_drawslab")));
--    long asm_stretchhline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_stretchhline")));
--    long asm_isvmwarerunning(void) __attribute__ ((alias ("_asm_isvmwarerunning")));
-+    long asm_mmxoverlay(void) asm ("_asm_mmxoverlay");
-+    long asm_sethlinesizes(long,long,long) asm ("_asm_sethlinesizes");
-+    long asm_setpalookupaddress(char *) asm ("_asm_setpalookupaddress");
-+    long asm_setuphlineasm4(long,long) asm ("_asm_setuphlineasm4");
-+    long asm_hlineasm4(long,long,long,long,long,long) asm ("_asm_hlineasm4");
-+    long asm_setuprhlineasm4(long,long,long,long,long,long) asm ("_asm_setuprhlineasm4");
-+    long asm_rhlineasm4(long,long,long,long,long,long) asm ("_asm_rhlineasm4");
-+    long asm_setuprmhlineasm4(long,long,long,long,long,long) asm ("_asm_setuprmhlineasm4");
-+    long asm_rmhlineasm4(long,long,long,long,long,long) asm ("_asm_rmhlineasm4");
-+    long asm_setupqrhlineasm4(long,long,long,long,long,long) asm ("_asm_setupqrhlineasm4");
-+    long asm_qrhlineasm4(long,long,long,long,long,long) asm ("_asm_qrhlineasm4");
-+    long asm_setvlinebpl(long) asm ("_asm_setvlinebpl");
-+    long asm_fixtransluscence(long) asm ("_asm_fixtransluscence");
-+    long asm_prevlineasm1(long,long,long,long,long,long) asm ("_asm_prevlineasm1");
-+    long asm_vlineasm1(long,long,long,long,long,long) asm ("_asm_vlineasm1");
-+    long asm_setuptvlineasm(long) asm ("_asm_setuptvlineasm");
-+    long asm_tvlineasm1(long,long,long,long,long,long) asm ("_asm_tvlineasm1");
-+    long asm_setuptvlineasm2(long,long,long) asm ("_asm_setuptvlineasm2");
-+    long asm_tvlineasm2(long,long,long,long,long,long) asm ("_asm_tvlineasm2");
-+    long asm_mvlineasm1(long,long,long,long,long,long) asm ("_asm_mvlineasm1");
-+    long asm_setupvlineasm(long) asm ("_asm_setupvlineasm");
-+    long asm_vlineasm4(long,long) asm ("_asm_vlineasm4");
-+    long asm_setupmvlineasm(long) asm ("_asm_setupmvlineasm");
-+    long asm_mvlineasm4(long,long) asm ("_asm_mvlineasm4");
-+    void asm_setupspritevline(long,long,long,long,long,long) asm ("_asm_setupspritevline");
-+    void asm_spritevline(long,long,long,long,long,long) asm ("_asm_spritevline");
-+    void asm_msetupspritevline(long,long,long,long,long,long) asm ("_asm_msetupspritevline");
-+    void asm_mspritevline(long,long,long,long,long,long) asm ("_asm_mspritevline");
-+    void asm_tsetupspritevline(long,long,long,long,long,long) asm ("_asm_tsetupspritevline");
-+    void asm_tspritevline(long,long,long,long,long,long) asm ("_asm_tspritevline");
-+    long asm_mhline(long,long,long,long,long,long) asm ("_asm_mhline");
-+    long asm_mhlineskipmodify(long,long,long,long,long,long) asm("_asm_mhlineskipmodify");
-+    long asm_msethlineshift(long,long) asm("_asm_msethlineshift");
-+    long asm_thline(long,long,long,long,long,long) asm("_asm_thline");
-+    long asm_thlineskipmodify(long,long,long,long,long,long) asm("_asm_thlineskipmodify");
-+    long asm_tsethlineshift(long,long) asm("_asm_tsethlineshift");
-+    long asm_setupslopevlin(long,long,long) asm("_asm_setupslopevlin");
-+    long asm_slopevlin(long,long,long,long,long,long) asm("_asm_slopevlin");
-+    long asm_settransnormal(void) asm("_asm_settransnormal");
-+    long asm_settransreverse(void) asm("_asm_settransreverse");
-+    long asm_setupdrawslab(long,long) asm("_asm_setupdrawslab");
-+    long asm_drawslab(long,long,long,long,long,long) asm("_asm_drawslab");
-+    long asm_stretchhline(long,long,long,long,long,long) asm("_asm_stretchhline");
-+    long asm_isvmwarerunning(void) asm("_asm_isvmwarerunning");
- 
-     /*
- 	 * !!! I need a reference to this, for mprotect(), but the actual function
-      * !!!  is never called in BUILD...just from other ASM routines. --ryan.
- 	 */
--    long asm_prohlineasm4(void) __attribute__ ((alias ("_asm_prohlineasm4")));
-+    long asm_prohlineasm4(void) asm("_asm_prohlineasm4");
- 
-   #endif /* ELF/GCC */
- #endif /* defined USE_I386_ASM */
diff --git a/games-fps/duke3d/files/duke3d-20040817-ldflags.patch b/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
deleted file mode 100644
index 79179e663805..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- source/buildengine/Makefile.old	2010-10-08 14:32:05.000000000 +0200
-+++ source/buildengine/Makefile	2010-10-08 14:35:10.000000000 +0200
-@@ -73,7 +73,7 @@
- endif
- 
- ifeq ($(strip $(solaris)),true)
--  LDFLAGS += -lsocket -lnsl
-+  LIBS += -lsocket -lnsl
-   CFLAGS += -DPLATFORM_SOLARIS
- endif
- 
-@@ -129,7 +129,7 @@
- 
- ifeq ($(strip $(macosx)),true)
-   CFLAGS += -DPLATFORM_MACOSX=1 -faltivec -falign-loops=32 -falign-functions=32
--  LDFLAGS += -framework AppKit -lSDL -lSDLmain
-+  LIBS += -framework AppKit -lSDL -lSDLmain
- endif
- 
- ifeq ($(strip $(useopengl)),true)
-@@ -146,7 +146,7 @@
- 
- ifeq ($(strip $(usephysfs)),true)
-   CFLAGS += -DUSE_PHYSICSFS
--  LDFLAGS += -lphysfs
-+  LIBS += -lphysfs
- endif
- 
- ifeq ($(strip $(usedlls)),true)
-@@ -236,17 +236,17 @@
- 
- ifeq ($(strip $(usedlls)),true)
- $(ENGINEDLL) : $(ENGINEOBJS)
--	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
-+	$(LINKER) -shared -o $(ENGINEDLL) $(LIBS) $(ENGINEOBJS) $(LDLIBS)
- 
- $(NETDLL) : $(NETOBJS)
--	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
-+	$(LINKER) -shared -o $(NETDLL) $(LIBS) $(NETOBJS) $(LDLIBS)
- endif
- 
- $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
--	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
-+	$(LINKER) $(LDFLAGS) -o $(GAMEEXE) $(LIBS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
- 
- $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
--	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
-+	$(LINKER) $(LDFLAGS) -o $(BUILDEXE) $(LIBS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
- 
- listclean:
- 	@echo "A 'make clean' would remove" $(CLEANUP)
---- source/Makefile.old	2010-10-08 14:35:54.000000000 +0200
-+++ source/Makefile	2010-10-08 14:37:34.000000000 +0200
-@@ -152,10 +152,10 @@
- 	sounds.o \
- 	dukemusc.o \
- 	audiolib/audiolib.a
--	$(CC) $^ $(BUILDOBJS) $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) $(LDLIBS) -o $@
- 
- build: astub.o
--	$(CC) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
- 
- clean:
- 	$(MAKE) -C audiolib clean
diff --git a/games-fps/duke3d/files/duke3d-20040817-noinline.patch b/games-fps/duke3d/files/duke3d-20040817-noinline.patch
deleted file mode 100644
index a41c5c01d063..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-noinline.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- source/buildengine/engine.c.old     2009-02-06 09:11:54.000000000 +0100
-+++ source/buildengine/engine.c 2009-02-06 09:19:12.000000000 +0100
-@@ -391,6 +391,7 @@
-            modify exact [eax ebx ecx]\
- 
-     #elif (defined __GNUC__) || (defined __ICC)
-+       __attribute__ ((noinline))
-         static long nsqrtasm(int i1)
-         {
-             long retval;
-@@ -601,6 +602,7 @@
- 
-     #elif (defined __GNUC__) || (defined __ICC)
- 
-+       __attribute__ ((noinline))
-         int setgotpic(long i1)
-         {
-             int retval = 0;
diff --git a/games-fps/duke3d/files/duke3d.cfg b/games-fps/duke3d/files/duke3d.cfg
deleted file mode 100644
index 2e8c4a0671b7..000000000000
--- a/games-fps/duke3d/files/duke3d.cfg
+++ /dev/null
@@ -1,194 +0,0 @@
-[Setup]
-SetupVersion = "1.3D"
-
-[Screen Setup]
-ScreenMode = 2
-ScreenWidth = 1024
-ScreenHeight = 768
-Shadows = 1
-Password = ""
-Detail = 1
-Tilt = 1
-Messages = 1
-Out = 0
-ScreenSize = 8
-ScreenGamma = 0
-
-[Sound Setup]
-FXDevice = 0
-MusicDevice = 0
-FXVolume = 220
-MusicVolume = 200
-NumVoices = 8
-NumChannels = 2
-NumBits = 16
-MixRate = 44100
-MidiPort = 0x330
-BlasterAddress = 0x220
-BlasterType = 1
-BlasterInterrupt = 5
-BlasterDma8 = 1
-BlasterDma16 = 5
-BlasterEmu = 0x620
-ReverseStereo = 0
-SoundToggle = 1
-VoiceToggle = 1
-AmbienceToggle = 1
-MusicToggle = 1
-
-[KeyDefinitions]
-Move_Forward = "Up" "Kpad8"
-Move_Backward = "Down" "Kpad2"
-Turn_Left = "Left" "Kpad4"
-Turn_Right = "Right" "KPad6"
-Strafe = "LAlt" "RAlt"
-Fire = "LCtrl" "RCtrl"
-Open = "Space" ""
-Run = "LShift" "RShift"
-AutoRun = "CapLck" ""
-Jump = "A" "/"
-Crouch = "Z" ""
-Look_Up = "PgUp" "Kpad9"
-Look_Down = "PgDn" "Kpad3"
-Look_Left = "Insert" "Kpad0"
-Look_Right = "Delete" "Kpad."
-Strafe_Left = "," ""
-Strafe_Right = "." ""
-Aim_Up = "Home" "KPad7"
-Aim_Down = "End" "Kpad1"
-Weapon_1 = "1" ""
-Weapon_2 = "2" ""
-Weapon_3 = "3" ""
-Weapon_4 = "4" ""
-Weapon_5 = "5" ""
-Weapon_6 = "6" ""
-Weapon_7 = "7" ""
-Weapon_8 = "8" ""
-Weapon_9 = "9" ""
-Weapon_10 = "0" ""
-Inventory = "Enter" "KpdEnt"
-Inventory_Left = "[" ""
-Inventory_Right = "]" ""
-Holo_Duke = "H" ""
-Jetpack = "J" ""
-NightVision = "N" ""
-MedKit = "M" ""
-TurnAround = "BakSpc" ""
-SendMessage = "T" ""
-Map = "Tab" ""
-Shrink_Screen = "-" "Kpad-"
-Enlarge_Screen = "=" "Kpad+"
-Center_View = "KPad5" ""
-Holster_Weapon = "ScrLck" ""
-Show_Opponents_Weapon = "W" ""
-Map_Follow_Mode = "F" ""
-See_Coop_View = "K" ""
-Mouse_Aiming = "U" ""
-Toggle_Crosshair = "I" ""
-Steroids = "R" ""
-Quick_Kick = "`" ""
-Next_Weapon = "'" ""
-Previous_Weapon = ";" ""
-
-[Controls]
-ControllerType = 1
-JoystickPort = 0
-MouseSensitivity = 32768
-ExternalFilename = "EXTERNAL.EXE"
-EnableRudder = 0
-MouseAiming = 0
-MouseButton0 = "Fire"
-MouseButtonClicked0 = ""
-MouseButton1 = "Strafe"
-MouseButtonClicked1 = "Open"
-MouseButton2 = "Move_Forward"
-MouseButtonClicked2 = ""
-JoystickButton0 = "Fire"
-JoystickButtonClicked0 = ""
-JoystickButton1 = "Strafe"
-JoystickButtonClicked1 = "Inventory"
-JoystickButton2 = "Run"
-JoystickButtonClicked2 = "Jump"
-JoystickButton3 = "Open"
-JoystickButtonClicked3 = "Crouch"
-JoystickButton4 = "Aim_Down"
-JoystickButtonClicked4 = ""
-JoystickButton5 = "Look_Right"
-JoystickButtonClicked5 = ""
-JoystickButton6 = "Aim_Up"
-JoystickButtonClicked6 = ""
-JoystickButton7 = "Look_Left"
-JoystickButtonClicked7 = ""
-MouseAnalogAxes0 = "analog_turning"
-MouseDigitalAxes0_0 = ""
-MouseDigitalAxes0_1 = ""
-MouseAnalogScale0 = 0
-MouseAnalogAxes1 = "analog_moving"
-MouseDigitalAxes1_0 = ""
-MouseDigitalAxes1_1 = ""
-MouseAnalogScale1 = 0
-JoystickAnalogAxes0 = "analog_turning"
-JoystickDigitalAxes0_0 = ""
-JoystickDigitalAxes0_1 = ""
-JoystickAnalogScale0 = 0
-JoystickAnalogAxes1 = "analog_moving"
-JoystickDigitalAxes1_0 = ""
-JoystickDigitalAxes1_1 = ""
-JoystickAnalogScale1 = 0
-JoystickAnalogAxes2 = "analog_strafing"
-JoystickDigitalAxes2_0 = ""
-JoystickDigitalAxes2_1 = ""
-JoystickAnalogScale2 = 0
-JoystickAnalogAxes3 = ""
-JoystickDigitalAxes3_0 = "Run"
-JoystickDigitalAxes3_1 = ""
-JoystickAnalogScale3 = 0
-GamePadDigitalAxes0_0 = "Turn_Left"
-GamePadDigitalAxes0_1 = "Turn_Right"
-GamePadDigitalAxes1_0 = "Move_Forward"
-GamePadDigitalAxes1_1 = "Move_Backward"
-MouseAimingFlipped = 0
-GameMouseAiming = 0
-AimingFlag = 0
-
-[Comm Setup]
-ComPort = 2
-IrqNumber = 65535
-UartAddress = 65535
-PortSpeed = 9600
-ToneDial = 1
-SocketNumber = 65535
-NumberPlayers = 2
-ModemName = ""
-InitString = "ATZ"
-HangupString = "ATH0=0"
-DialoutString = ""
-PlayerName = "DUKE"
-RTSName = "DUKE.RTS"
-PhoneNumber = ""
-ConnectType = 0
-CommbatMacro#0 = "An inspiration for birth control."
-CommbatMacro#1 = "You're gonna die for that!"
-CommbatMacro#2 = "It hurts to be you."
-CommbatMacro#3 = "Lucky Son of a Bitch."
-CommbatMacro#4 = "Hmmm....Payback time."
-CommbatMacro#5 = "You bottom dwelling scum sucker."
-CommbatMacro#6 = "Damn, you're ugly."
-CommbatMacro#7 = "Ha ha ha...Wasted!"
-CommbatMacro#8 = "You suck!"
-CommbatMacro#9 = "AARRRGHHHHH!!!"
-
-[Misc]
-Executions = 5
-RunMode = 0
-Crosshairs = 1
-WeaponChoice0 = 3
-WeaponChoice1 = 4
-WeaponChoice2 = 5
-WeaponChoice3 = 7
-WeaponChoice4 = 8
-WeaponChoice5 = 6
-WeaponChoice6 = 0
-WeaponChoice7 = 2
-WeaponChoice8 = 9
-WeaponChoice9 = 1
diff --git a/games-fps/duke3d/files/network.cfg b/games-fps/duke3d/files/network.cfg
deleted file mode 100644
index 46db8b3119fb..000000000000
--- a/games-fps/duke3d/files/network.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# lifted from happypenguin.org
-
-INTERFACE [your ip address]
-
-# only peer appears to work [SERVER or CLIENT or PEER]
-MODE peer
-
-# create an allow line for everyone who will connect
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-
-# try to find [number] of players and start the game
-BROADCAST [number] 
diff --git a/games-fps/duke3d/metadata.xml b/games-fps/duke3d/metadata.xml
deleted file mode 100644
index 1f342d0fbdcc..000000000000
--- a/games-fps/duke3d/metadata.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-The third chapter in the series, and the first with a 3D perspective 
-(the original Duke Nukem and the sequel, Duke Nukem II, are side 
-scrolling platform games). This game, set sometime in the early 21st 
-century, begins in a ravaged LA, which was overtaken by aliens while you 
-were abducted during Duke Nukem II. Duke, upon returning to Earth, finds 
-himself with another mess to clean up, and another alien race that needs 
-exterminating. Duke is a can-do hero who realizes that sometimes 
-innocent people have to die in order to save Earth, so accuracy of gun 
-fire is not a real concern to him. :) 
-
-This game has a long list of cool things that haven't been attempted in 
-3D action games, yet. The weapons, for example, kick-butt: 
-
-    * There's a mine that can be placed on any wall and sends out a 
-laser trip beam-- perfect for multiplayer games. 
-    * There's also a shrinker ray that reduces an opponent to the size 
-of a G.I. Joe, at which point they are foot fodder--watch them splat! 
-    * As in Shadow Warrior, you can swim under water, and even shoot 
-players who are standing outside the water, or vice versa.
-
- What works:
-    * Basic gameplay seems fine.
-    * Sound and music.
-    * keyboard input.
-    * mouse input.
-    * Hi-res (what would be "VESA modes" in DOS).
-    * Windowed/fullscreen support.
-    * Save games.
-    * Record and playback demos compatible with the Atomic Edition (1.5).
-    * Shareware and retail versions should all work.
-    * BUILD editor works to a large degree.
-    * DukeBots for multiplayer AI.
-    * Assembly code all has portable C fallbacks, now.
-    * TCP/IP Networking!
-    * Linux/x86 port.
-    * Windows/x86 port.
-    * BeOS/x86 port.
-    * (incomplete) MacOS X port. 
-
-What doesn't work/known bugs:
-    * Joystick input isn't working yet.
-    * File cases need to be exact in some places, not others.
-    * Engine (game?) relies on compiler treating "char" as "unsigned" by default...this needs to be flushed out, for sanity's sake. But I'm anal. :)
-    * Netcode handles packet loss _VERY_ poorly...it's fine for stable connections and LANs, though.
-    * Configuring a multiplayer game involves editing text files and filling in IP addresses. Not very user-friendly.
-    * Some text prompts try to read the SDL input queue instead of stdin like they should.
-    * Probably other stuff. Do NOT consider this stable and complete yet! 
-</longdescription>
-  <use>
-    <flag name="demo">Install the demo files</flag>
-    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
deleted file mode 100644
index 33a3afc36403..000000000000
--- a/games-fps/lsdldoom/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lsdldoom-1.5.tar.gz 1227060 BLAKE2B cda64dc664f9fbe20264ef3a140a5f9eaad9589138df58cbe311b59208094affbdf090a0ebc8cd8f1841e46c69cccb2e5b17fb3a6ae927b00c3ae38d83f7bb77 SHA512 49d68040c312e8a27b452eb54acb1a4197dee157678de9e902cc2f17a38e621c5980eadf9c78e1945b9d5fb863dd1bdbdcd08c1c5e50971ee73857b7b3e47e33
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
deleted file mode 100644
index 686e3450a620..000000000000
--- a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urN lsdldoom-1.5.orig//Makefile.in lsdldoom-1.5/Makefile.in
---- lsdldoom-1.5.orig//Makefile.in	2011-10-23 22:17:01.582705152 -0700
-+++ lsdldoom-1.5/Makefile.in	2011-10-23 22:18:00.846237242 -0700
-@@ -209,7 +209,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/share/doc/@PACKAGE@
-+docdir = /usr/share/doc/$(PF)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -urN lsdldoom-1.5.orig//configure lsdldoom-1.5/configure
---- lsdldoom-1.5.orig//configure	2011-10-23 22:17:01.544700322 -0700
-+++ lsdldoom-1.5/configure	2011-10-23 22:18:00.829235080 -0700
-@@ -5689,10 +5689,10 @@
- then exec_prefix=$prefix
- fi
- 
--gamesdir=$prefix/games
-+gamesdir=$bindir
- exp_gamesdir=`eval "echo $gamesdir"`
- exp_datadir=`eval "echo $datadir"`
--waddir=$exp_datadir/games/doom
-+waddir=$exp_datadir/doom-data
- cat >>confdefs.h <<_ACEOF
- #define DOOMWADDIR "$waddir"
- _ACEOF
-diff -urN lsdldoom-1.5.orig//data/Makefile.in lsdldoom-1.5/data/Makefile.in
---- lsdldoom-1.5.orig//data/Makefile.in	2011-10-23 22:17:01.634711762 -0700
-+++ lsdldoom-1.5/data/Makefile.in	2011-10-23 22:18:00.844236988 -0700
-@@ -188,7 +188,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--waddir = $(datadir)/games/doom
-+waddir = $(datadir)/doom-data
- wad_DATA = boomlump.wad
- EXTRA_DIST = boomlump.wad
- all: all-am
-diff -urN lsdldoom-1.5.orig//doc/Makefile.in lsdldoom-1.5/doc/Makefile.in
---- lsdldoom-1.5.orig//doc/Makefile.in	2011-10-23 22:17:00.348548297 -0700
-+++ lsdldoom-1.5/doc/Makefile.in	2011-10-23 22:18:00.840236480 -0700
-@@ -158,7 +158,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/share/doc/@PACKAGE@
-+docdir = /usr/share/doc/$(PF)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -urN lsdldoom-1.5.orig//src/Makefile.in lsdldoom-1.5/src/Makefile.in
---- lsdldoom-1.5.orig//src/Makefile.in	2011-10-23 22:17:01.041636386 -0700
-+++ lsdldoom-1.5/src/Makefile.in	2011-10-23 22:18:00.835235845 -0700
-@@ -242,7 +242,7 @@
- # Process this file with automake to produce Makefile.in
- #
- #
--gamesdir = $(prefix)/games
-+gamesdir = $(bindir)
- games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
- @I386_ASM_FALSE@ASMS = 
- @I386_ASM_TRUE@ASMS = drawspan.S drawcol.S drawasm.h
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
deleted file mode 100644
index 805a8dfc2d87..000000000000
--- a/games-fps/lsdldoom/lsdldoom-1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Port of ID's doom to SDL"
-HOMEPAGE="http://jesshaas.com/lsdldoom/"
-SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~x86"
-IUSE="+net +shareware freedoom"
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	net? ( media-libs/sdl-net )"
-RDEPEND="${DEPEND}
-	shareware? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-paths.patch
-}
-
-src_configure() {
-	# cpu-opt -> just adds -mcpu crap to CFLAGS
-	egamesconf \
-		--disable-dependency-tracking \
-		--disable-cpu-opt \
-		$(use_enable net net-game)
-}
-
-src_install() {
-	DOCS="ChangeLog" \
-		default
-	prepgamesdirs
-}
diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
deleted file mode 100644
index fdebef0b5c68..000000000000
--- a/games-fps/lsdldoom/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="net">Enables network game support</flag>
-	<flag name="shareware">Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
-	<flag name="freedoom">Install <pkg>games-fps/freedoom</pkg> wad file</flag>
-</use>
-</pkgmetadata>
diff --git a/games-fps/soldieroffortune-demo/Manifest b/games-fps/soldieroffortune-demo/Manifest
deleted file mode 100644
index 4d6242bbd0c2..000000000000
--- a/games-fps/soldieroffortune-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sof-demo.run 92496052 BLAKE2B 6aded47641d13eb8438d5bf4f7d4df2b8e46dbb9a14c31d02ac8adade6b2ea1063bca0f8c0a712df3f078b413e655a5d8bd50f1ff7d7d01270e50387f3a70b9a SHA512 d285cffe5ed9017409737120d63f1bb14a4ae2f54a83bc2b4d838e82440f43fe430ea63b7765496121633e6fbf40053fe2c5bbda37e48e6da8b18aaa2ff540a6
diff --git a/games-fps/soldieroffortune-demo/metadata.xml b/games-fps/soldieroffortune-demo/metadata.xml
deleted file mode 100644
index 0ea4bdc912f5..000000000000
--- a/games-fps/soldieroffortune-demo/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Soldier of Fortune is a first-person 3-D shooter based on the mercenary trade.  You play as John, an ex-military mercinary who still has plenty of good friends on the inside.  For a wad of bucks, you'll do the job -- no cares, no worries. Just get the gun, play for keeps, get paid, on to the next one -- that's your life. That's what you do. And you're good at it, one of the best even. But now is the time for your biggest challenge ever.  This is the demo version of the game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
deleted file mode 100644
index 91362dc07442..000000000000
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_PN=${PN/soldieroffortune/sof}
-
-DESCRIPTION="First-person shooter based on the mercenary trade"
-HOMEPAGE="http://www.lokigames.com/products/sof/"
-SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="virtual/opengl[abi_x86_32(-)]
-	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
-	x11-libs/libXrender[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	media-libs/smpeg[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/* ${dir:1}/base/*so"
-
-src_install() {
-	local demo="data/demos/sof_demo"
-	local exe="sof-bin.x86"
-
-	loki_patch patch.dat data/ || die
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doins -r "${demo}"/*
-	doexe "${demo}/${exe}"
-
-	# Replace bad library
-	dosym /usr/$(use amd64 && echo lib32 || echo lib)/libSDL.so "${dir}"/libSDL-1.1.so.0
-
-	games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
-
-	# fix buffer overflow
-	sed -i \
-		-e '/^exec/i \
-export MESA_EXTENSION_MAX_YEAR=2003 \
-export __GL_ExtensionStringVersion=17700' "${ED}"${GAMES_BINDIR}/${PN} || die
-
-	newicon "${demo}"/launch/box.png ${PN}.png
-	make_desktop_entry ${PN} "Soldier of Fortune (Demo)"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "This game requires OSS sound device /dev/dsp ; make sure the module"
-	ewarn "snd_pcm_oss is loaded and/or built into your kernel or there will be no sound"
-	elog
-	elog "Run '${PN}' to start the game"
-}
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
deleted file mode 100644
index 594c04018661..000000000000
--- a/games-puzzle/ensemblist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ensemblist-040126.tar.gz 1312095 BLAKE2B 715aba1d5d62b3b4f7889b87ed70f1a33441d8ce7fe878c17dbdd342b45906c9242eb34b9eca8d34f41e9146d1eceac771e28e49b209b85dac31fce8e16b21eb SHA512 59202fe3c6168cfd60a7204f64dba5ab9fec2aa80e32be2f649862cf60dd27df0a51f4359161f8ca1ab3cf541fb1ea127f4f83b2213c4cb40bf6a574c14c8052
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
deleted file mode 100644
index 559fa92b6034..000000000000
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Put together several primitives to build a given shape. (C.S.G. Game)"
-HOMEPAGE="http://www.nongnu.org/ensemblist/index_en.html"
-SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="media-libs/freeglut
-	media-libs/libmikmod:0
-	media-libs/libpng:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" \
-		CFLAGSLD="${LDFLAGS}"
-}
-
-src_install() {
-	dogamesbin ensemblist
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r datas
-	dodoc Changelog README
-	make_desktop_entry ${PN} Ensemblist
-	prepgamesdirs
-}
diff --git a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
deleted file mode 100644
index 42cc04070eef..000000000000
--- a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru ensemblist-040126.orig/Makefile ensemblist-040126/Makefile
---- ensemblist-040126.orig/Makefile	2004-01-26 10:37:05.000000000 -0500
-+++ ensemblist-040126/Makefile	2009-01-23 03:24:05.000000000 -0500
-@@ -1,17 +1,8 @@
- NAME=ensemblist
--CC=gcc
--ifdef DEBUG
--DATADIR=/home/rixed/src/ensemblist/datas
--COMPILE_FLAGS=-Wall -fno-builtin -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wredundant-decls -O0 -g `libmikmod-config --cflags` -DDATADIR=$(DATADIR)
--LINK_FLAGS=-g -lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lefence -lpthread
--else
- DATADIR=$(DESTDIR)/usr/share/$(NAME)
--COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
--LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
--endif
-+COMPILE_FLAGS=`libmikmod-config --cflags` -DDATADIR=$(DATADIR)
-+LINK_FLAGS=-L/usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -lm
- APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
--#uncomment the following if you want to compile on MacOS/X
--#LINK_FLAGS=$(LINK_FLAGS) $(APPLE_FRAMEWORKS)
- CFILES=$(wildcard *.c)
- OFILES=$(patsubst %.c,%.o,$(CFILES))
- 
-@@ -22,15 +13,10 @@
- all: $(NAME)
- 
- $(NAME): $(OFILES)
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) $(LINK_FLAGS) $^ -o $@
--ifndef DEBUG
--	strip $(NAME)
--endif
-+	$(CC) $(CFLAGSLD) $(COMPILE_FLAGS) $^ -o $@ $(LINK_FLAGS) 
- 
- .c.o:
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) -c $<
-+	$(CC) $(CFLAGS) $(COMPILE_FLAGS) -c $<
- 
- clean:
- 	@echo '$(COL)$@$(NORM)'
diff --git a/games-puzzle/ensemblist/metadata.xml b/games-puzzle/ensemblist/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/ensemblist/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
deleted file mode 100644
index 891c0a63a608..000000000000
--- a/games-puzzle/hoh-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hohlin-101.tar.bz2 14808528 BLAKE2B bfa0563f900f5bf7fdb05011baddd0fcc4c1f16eb30215f9db8b539e7c1b6f11e2c978a978c989732d832e309b3f61f0ee1ac4270c45c8c7d0e82f155d987004 SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
deleted file mode 100644
index ad681b47a18e..000000000000
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="PC remake of the spectrum game, Head Over Heels"
-HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
-SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-
-S=${WORKDIR}/hoh-install-${PV}
-
-# bug #448420
-QA_PREBUILT="
-/opt/HoH/data/runtime/libstdc++-libc6.2-2.so.3
-/opt/HoH/data/HoH
-"
-
-src_compile() {
-	cat > "${T}/hoh" <<-EOF
-		#!/bin/bash
-		export LD_LIBRARY_PATH="${GAMES_PREFIX_OPT}/HoH/data/runtime"
-		cd "${GAMES_PREFIX_OPT}/HoH/data"
-		exec ./HoH \$@
-EOF
-}
-
-src_install() {
-	local DATADIR="${GAMES_PREFIX_OPT}/HoH/data"
-	local DOCDIR="${GAMES_PREFIX_OPT}/HoH/docs"
-
-	dogamesbin "${T}/hoh"
-	dodir "${DATADIR}" "${DOCDIR}"
-	cp -pPRf data/* "${D}/${DATADIR}/" || die
-	cp -pPRf docs/* "${D}/${DOCDIR}/"  || die
-	make_desktop_entry hoh "Head Over Heels"
-	prepgamesdirs
-}
diff --git a/games-puzzle/hoh-bin/metadata.xml b/games-puzzle/hoh-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/hoh-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-sports/miniracer/Manifest b/games-sports/miniracer/Manifest
deleted file mode 100644
index 33233c90f4b7..000000000000
--- a/games-sports/miniracer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST miniracer-1.04.tar.gz 5315353 BLAKE2B 8f5081ef4ab323e97e4cdc35a6bf713534c8680b7949a8d47e3b8ef32427c333448d520d8b9cfa75f45819c2b805106f1e98a88704069288aa98b9f2776682d5 SHA512 6dc34371b6ea2d67c4a7d86b1200c9e7c7d56ef6b91af5ec4b0648da11dcfe6e125f6dc401a85e4c5bd3af2980d5a54b322c5466f96b7e21683e85ec4a7b0d6c
diff --git a/games-sports/miniracer/files/miniracer-1.04-ldflags.patch b/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
deleted file mode 100644
index 4c37dc9e1aa3..000000000000
--- a/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.old	2010-10-13 12:41:01.000000000 +0200
-+++ Makefile	2010-10-13 12:56:04.000000000 +0200
-@@ -10,13 +10,12 @@
- 
- BUILDDIR=obj
- 
--CC=gcc
- DEFS=-DVIDMODEXT_GAMMA_RAMP -DSOUND
--INCLUDES= -I. -I/usr/X11R6/include -I/usr/include/SDL
--CFLAGS=$(DEFS) $(INCLUDES) -O3 -march=i486 -ffast-math -fexpensive-optimizations
-+INCLUDES= -I. -I/usr/X11R6/include $(shell sdl-config --cflags)
-+CFLAGS=$(DEFS) $(INCLUDES) @CFLAGS@
- 
- GL_LDFLAGS=-L/usr/X11R6/lib -lGL -lXxf86dga -lXxf86vm -lX11 -lXext -lm
--LDFLAGS=$(GL_LDFLAGS) -ldl -lSDL -lSDL_mixer -lpthread
-+LDLIBS=$(GL_LDFLAGS) -ldl -lSDL_mixer $(shell sdl-config --libs)
- 
- #############################################################################
- # SETUP AND BUILD
-@@ -43,15 +42,16 @@
- build_release: engine.glx
- 
- install:
--	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)@GAMES_BINDIR@
- 	install -d $(DESTDIR)/usr/share/man/man6
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data/maps
--	install -m 755 engine.glx $(DESTDIR)/usr/share/games/MiniRacer
-+	install -d $(DESTDIR)@GAMES_LIBDIR@
-+	install -m 755 engine.glx $(DESTDIR)@GAMES_LIBDIR@
- 	install -m 644 data/pak0.pak $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -m 644 data/config.cfg $(DESTDIR)/usr/share/games/MiniRacer/data
--	install -m 755 miniracer $(DESTDIR)/usr/bin/miniracer
-+	install -m 755 miniracer $(DESTDIR)@GAMES_BINDIR@/miniracer
- 	install -m 644 miniracer.6 $(DESTDIR)/usr/share/man/man6
- 	install -m 644 data/maps/*.bsp $(DESTDIR)/usr/share/games/MiniRacer/data/maps
- 	install -m 644 data/maps/maps1.lst $(DESTDIR)/usr/share/games/MiniRacer/data/maps
-@@ -145,7 +145,7 @@
- 	$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
- 
- engine.glx : $(GLMR_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDLIBS)
- 
- #############################################################################
- # MISC
diff --git a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
deleted file mode 100644
index 0bb0b5da846e..000000000000
--- a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- miniracer.old	2010-02-27 21:05:11.000000000 +0100
-+++ miniracer	2010-02-27 21:10:34.000000000 +0100
-@@ -12,10 +12,6 @@
- fi
- 
- #checks for files
--if ! [ -f $HOME/.MiniRacer/engine.glx ]; then
--	ln -s $MINIRACERDIR/engine.glx $HOME/.MiniRacer
--fi
--
- if ! [ -f $HOME/.MiniRacer/data/pak0.pak ]; then
- 	ln -s $MINIRACERDIR/data/pak0.pak $HOME/.MiniRacer/data
- fi
-@@ -35,7 +31,4 @@
- 
- # change directory and start MiniRacer
- cd $HOME/.MiniRacer
--./engine.glx $*
--
--exit 0
--      
-\ No newline at end of file
-+exec @GAMES_LIBDIR@/engine.glx $*
diff --git a/games-sports/miniracer/metadata.xml b/games-sports/miniracer/metadata.xml
deleted file mode 100644
index b948d3db5863..000000000000
--- a/games-sports/miniracer/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">miniracer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
deleted file mode 100644
index 9b4490f7ca13..000000000000
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="an OpenGL car racing game, based on ID's famous Quake engine"
-HOMEPAGE="http://miniracer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-	media-libs/libsdl
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nosharedelf.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:@CFLAGS@:${CFLAGS}:" \
-		-e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GAMES_BINDIR@:${GAMES_BINDIR}:" \
-		miniracer Makefile || die
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-strategy/heroes3-demo/Manifest b/games-strategy/heroes3-demo/Manifest
deleted file mode 100644
index d01624168764..000000000000
--- a/games-strategy/heroes3-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heroes3-demo.run 99026773 BLAKE2B 48963111c1f076acc2eb3f34a3b86d64943777ea76e8fba09f883bdfe4b89c4daa07e9e5dc584f2a11adda957869728c0806726ef21c6ff82843605e32e34ab7 SHA512 a3f60f12f7ce8ea0f160ec211e1f077693ff2f5e4b8b85ae0e31f1230a910b4df7c8c6a340762d4f09c9845d6141d235307f933305557a75fc63f409e077ac71
diff --git a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
deleted file mode 100644
index d20f909b2cb3..000000000000
--- a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_PN=${PN%-demo}
-
-DESCRIPTION="turn-based 2D medieval combat"
-HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-# Should also work on ppc
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND=">=sys-libs/lib-compat-loki-0.2
-	|| (
-		ppc? (
-			x11-libs/libX11
-		)
-		!ppc? (
-			x11-libs/libX11[abi_x86_32(-)]
-		)
-	)"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/*"
-
-S=${WORKDIR}
-
-src_install() {
-	# Apply patch
-	loki_patch patch.dat data/ || die
-
-	local demo="data/demos/${MY_PN}_demo"
-
-	local exe_stub="${MY_PN}_demo"
-	if use ppc ; then
-		exe="${exe_stub}.ppc"
-	else
-		exe="${exe_stub}.x86"
-	fi
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doins -r "${demo}"/*
-	rm "${D}/${dir}"/{${exe_stub}*,*.sh} || die
-	doexe "${demo}/${exe}"
-
-	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-	dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
-	dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
-	dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-
-	games_make_wrapper ${PN} "./${exe}" "${dir}"
-	newicon "${demo}/icon.xpm" ${PN}.png
-	make_desktop_entry ${PN} "Heroes of Might and Magic III (Demo)" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-strategy/heroes3-demo/metadata.xml b/games-strategy/heroes3-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/heroes3-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-libs/libwhisker/Manifest b/net-libs/libwhisker/Manifest
deleted file mode 100644
index 3f4483ac0a11..000000000000
--- a/net-libs/libwhisker/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libwhisker2-2.5.tar.gz 207569 BLAKE2B d5e2d9a7cc6801ded09f073a4d658aece97755244e16ee79269d20b1c1059802ad28540d354bd92a725e08eccd728c44b8c7ea45b795057fd96d2dcb9f944fd2 SHA512 ea3cfa7658048b23d4fd773db9ee7fde32758096cf7491d309390247648b7635952d734a0918f53109de37cdd87b675843320539db727fd107e81647b13bce10
diff --git a/net-libs/libwhisker/libwhisker-2.5-r1.ebuild b/net-libs/libwhisker/libwhisker-2.5-r1.ebuild
deleted file mode 100644
index 17bf43d4d46a..000000000000
--- a/net-libs/libwhisker/libwhisker-2.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="Perl module geared to HTTP testing"
-HOMEPAGE="http://www.wiretrip.net/rfp/lw.asp"
-SRC_URI="http://www.wiretrip.net/rfp/libwhisker/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-DEPEND=""
-RDEPEND="virtual/perl-MIME-Base64
-	ssl? ( dev-perl/Net-SSLeay )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	perl Makefile.pl lib || die
-}
-
-src_install() {
-	perl_set_version
-	insinto "${VENDOR_LIB}"
-	doins LW2.pm
-	dodoc CHANGES KNOWNBUGS README
-}
diff --git a/net-libs/libwhisker/metadata.xml b/net-libs/libwhisker/metadata.xml
deleted file mode 100644
index eb87724cfa69..000000000000
--- a/net-libs/libwhisker/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>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<longdescription>
-		Libwhisker is a Perl library useful for HTTP testing scripts.  It
-		contains a pure-Perl implementation of functionality found in the LWP,
-		URI, Digest::MD5, Digest::MD4, Data::Dumper, Authen::NTLM, HTML::Parser,
-		HTML::FormParser, CGI::Upload, MIME::Base64, and GetOpt::Std modules.
-		Libwhisker is designed to be portable (a single perl file), fast
-		(general benchmarks show libwhisker is faster than LWP), and flexible
-		(great care was taken to ensure the library does exactly what you want
-		to do, even if it means breaking the protocol).
-	</longdescription>
-</pkgmetadata>
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index bbcccdd6586c..58c01717f093 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -107,7 +107,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -132,7 +131,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/knights-demo
 games-strategy/majesty-demo
 games-strategy/smac
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index fa955997fbd1..6819c4f39b7a 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -84,10 +84,6 @@ net-im/telepathy-connection-managers -steam
 # Missing keywords
 app-misc/workrave mate
 
-# Patrick Lauer <patrick@gentoo.org> (13 Jan 2015)
-# Dependencies lack keywords
-games-fps/lsdldoom shareware
-
 # Julian Ospald <hasufell@gentoo.org> (23 Nov 2013)
 # FIXME: app-arch/innoextract not available under ppc yet
 games-fps/duke3d-data gog
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index bd2e1559c9bf..4dbd1e687ac7 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -39,7 +39,6 @@ games-arcade/aquaria
 games-arcade/barbarian-bin
 games-arcade/dynamitejack
 games-arcade/jardinains
-games-arcade/marbleblastgold-demo
 games-arcade/thinktanks-demo
 games-emulation/nestra
 games-emulation/zinc
@@ -56,7 +55,6 @@ games-fps/quake3-demo
 games-fps/rtcwmp-demo
 games-fps/rtcwsp-demo
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/transfusion-bin
 games-fps/tribes2
 games-fps/ut2003
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 6c805c2936ec..f674b76e8e1e 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # AMD64 Team <amd64@gentoo.org>
@@ -79,7 +79,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -97,7 +96,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 21d6c09ce882..56369db82066 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -22,7 +22,6 @@ games-action/descent3-demo
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/trine
-games-arcade/marbleblastgold-demo
 games-fps/enemy-territory
 games-fps/enemy-territory-etpro
 games-fps/enemy-territory-truecombat
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 8dee37aab29a..fd047b076a7d 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -99,7 +99,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -119,7 +118,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
diff --git a/profiles/package.mask b/profiles/package.mask
index 8c56e8d60821..a67e3af53221 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -268,93 +268,9 @@ games-strategy/gorky17-demo
 net-vpn/miredo
 
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to compile (#648430), crashes from time to time (#222065). Removal
-# in a month.
-app-misc/wyrd
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not compatible with recent perl, not needed by anything in the tree
-# (#648582). Removal in a month.
-app-doc/mkdoxy
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # Doesn't run, cannot bump it (#651146). Removal in a month.
 games-emulation/hatari
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead lib not used by anything in the tree (#652186). Removal in a month.
-net-libs/libwhisker
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead for ages, nothing requires it, needs klibc (that is also completely
-# unmaintained in our side) (#653390). Removal in a month.
-sys-boot/getdvhoff
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Both games crash on start (#653812). Removal in a month.
-games-arcade/marbleblast-demo
-games-arcade/marbleblastgold-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Crashes at start (#653998). Removal in a month.
-games-arcade/skystreets
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# This installs an older GUI than the one provided by fceux package
-# (#654294). Removal in a month.
-games-emulation/gfceux
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for ages, doesn't work on amd64, other distros killed it
-# long time ago (#654302). Removal in a month.
-games-emulation/hugo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't support amd64, relies on virtual/libstdc++ (#654306). Removal in a
-# month.
-games-emulation/kigb
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Our version is completely outdated, a major version bump and rework of the
-# ebuild is needed (#654336). Removal in a month.
-games-emulation/raine
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for a long time, not compatible with amd64, people can use
-# quake2-icculus with aalib under SDL (#654348). Removal in a month.
-games-fps/aaquake2
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not required by anything in the tree, upstream disappeared long time ago
-# (#654352). Removal in a month.
-games-fps/doomsday-resources
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to run, use eduke32 instead (#654480). Removal in a month.
-games-fps/duke3d
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run on amd64, prboom can be used instead (#654482). Removal in a
-# month.
-games-fps/lsdldoom
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to start (#654492). Removal in a month.
-games-fps/soldieroffortune-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead since 2003, not ported ever to amd64 (#654516). Removal in a month.
-games-puzzle/ensemblist
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run (#654520). Removal in a month.
-games-puzzle/hoh-bin
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run (#654554, #654650). Removal in a month.
-games-sports/miniracer
-games-strategy/heroes3-demo
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.
@@ -380,15 +296,6 @@ virtual/httpd-php:7.3
 =sys-kernel/vanilla-sources-4.9.104
 =sys-kernel/vanilla-sources-4.4.134
 
-# Michał Górny <mgorny@gentoo.org> (30 May 2018)
-# Gentoo repository mirrors are now running on Gentoo Infastructure,
-# and the key used to sign commits is appropriately part of the regular
-# keyring (>=app-crypt/openpgp-keys-gentoo-release-20180530).  Please
-# upgrade this keyring, and remove the custom sync-openpgp-key-path from
-# your repos.conf to make Portage use the release keys.
-# Removal in 30 days.
-app-crypt/openpgp-keys-gentoo-mirror
-
 # Kent Fredric <kentnl@gentoo.org> (27 May 2018)
 # Subject to Man-in-the-middle security bypass vulnerability.
 # Retained in tree only for users who need older versions
@@ -396,11 +303,6 @@ app-crypt/openpgp-keys-gentoo-mirror
 # Bug: #623942
 <dev-perl/DBD-mysql-4.44.0
 
-# Akinori Hattori <hattya@gentoo.org> (27 May 2018)
-# Dead upstream, for old versions of iBus
-# Masked for removal in 30 days.
-app-i18n/ibus-tutcode
-
 # Matt Turner <mattst88@gentoo.org> (25 May 2018)
 # New package. Needs to interact with media-libs/mesa and
 # x11-drivers/nvidia-drivers. Work in progress.
@@ -429,12 +331,6 @@ media-libs/libglvnd
 # Masked for initial testing
 >=dev-db/mysql-connector-c++-8.0.0
 
-# Rick Farina <zerochaos@gentoo.org> (04 Apr 2018)
-# Violates PMS and does not work with stable portage.
-# Masked for removal in 60 days, lift mask if bug #650126 is fixed
-sys-fs/aufs3
-sys-fs/aufs4
-
 # Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
 # Requires >=dev-libs/icu-61.1
 # https://bugs.gentoo.org/651698
@@ -789,7 +685,6 @@ games-action/phobiaii
 games-fps/rtcw
 games-fps/unreal
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/smac
 
 # Mikle Kolyada <zlogene@gentoo.org> (27 Jun 2014)
diff --git a/sys-boot/getdvhoff/Manifest b/sys-boot/getdvhoff/Manifest
deleted file mode 100644
index 828a3fbd7a5b..000000000000
--- a/sys-boot/getdvhoff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sgibootcd-0.12.tar.bz2 3810 BLAKE2B 973c6e01f1e90b9009b57725e59e295e8cbdcc30595735eab1a4cd3929aa71edde66d352bb04b61670eb7ad464916d0e4b83f6fabbc8f641c150edcf96f4985c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e
diff --git a/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild b/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild
deleted file mode 100644
index 44d53d1e9199..000000000000
--- a/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility for use on LiveCDs to calculate offset of the ext2 partition for losetup"
-HOMEPAGE="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/"
-SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/sgibootcd-${PV}.tar.bz2"
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~mips"
-IUSE=""
-DEPEND="dev-libs/klibc"
-RESTRICT=""
-S="${WORKDIR}/sgibootcd-${PV}"
-MY_S="${S}/helpers"
-
-src_compile() {
-	cd ${MY_S}
-	local mycc="$(tc-getCC)"
-	local mysrc="getdvhoff.c"
-	local klloc="/usr/lib/klibc"
-	local klobjs="${klloc}/lib/crt0.o ${klloc}/lib/libc.a"
-	local klcflags="-march=mips3 -Os -fno-pic -mno-abicalls -I${klloc}/include -I${klloc}/include/bits32 -D__KLIBC__ -nostdlib"
-
-	[ -f "${MY_S}/getdvhoff" ] && rm -f ${MY_S}/${PN}
-	einfo "${mycc} ${klcflags} ${mysrc} ${klobjs} -o ${PN} -N"
-	${mycc} ${klcflags} ${mysrc} ${klobjs} -o ${PN} -N
-}
-
-src_install() {
-	cd ${MY_S}
-	dodir /usr/lib/${PN}
-	cp "${MY_S}"/"${PN}" "${D}"/usr/lib/"${PN}"
-}
diff --git a/sys-boot/getdvhoff/metadata.xml b/sys-boot/getdvhoff/metadata.xml
deleted file mode 100644
index e4344125b38d..000000000000
--- a/sys-boot/getdvhoff/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mips@gentoo.org</email>
-		<name>Mips Team</name>
-	</maintainer>
-
-	<longdescription>
-		getdvhoff - Utility for use on LiveCDs to calculate offset of the ext2 partition for losetup
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
deleted file mode 100644
index f417411d2157..000000000000
--- a/sys-fs/aufs3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST aufs3-standalone-3_p20160219.tar.xz 3256736 BLAKE2B e76a3d239b8b3d4325b33158aebd6154c52f56b5ddcfa997c148e00fcaa8b4af5daaa6794f81d2fd6e45f540815fdb89b71b2b9f861252a2569b34ee11698909 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af
-DIST aufs3-standalone-3_p20160223.tar.xz 3270932 BLAKE2B 12ce1f1b4babc70521e27f835f504c9779148b525c2b041f4c02f628517fee72915474ccbffe63ac1eb309e6ec5430d5c1359b5b83e7a89df5a69b2ba53fa0c7 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f
-DIST aufs3-standalone-3_p20160627.tar.xz 3443904 BLAKE2B df8d6917bc7141b024315ff4ff3d175dd78146f856c3d8e8b6889fd13cbf67887cc543353bb1643cde927b50b7858711d305b2bb71cab79211fbb2dbbb629224 SHA512 6c6256d5f042dbcde26abfb665fdfd8eee4193104fc3270371fdf503a560dd888b5306e3cfe4c6a1f95cd669b41279573dfc54aec8b5b5327220fa055bbbdb3d
-DIST aufs3-standalone-3_p20160815.tar.xz 3501932 BLAKE2B 49fb402f6f651ed46a6d71011a2e581dda857f01deb632d7a2581ef3b68d3c7939692f30a61b1b3adb401d1ee1f4274f0c0ed0c5cb31ea17cff2c61dd47e56e0 SHA512 502a1516e0e9f307a9e29669799f9572b225b38ed7c790130bd9d9c01fcb83d2bf81ca5d27136827b595838e9ee42544d9be130bf632be6a61cdf7e07d0f9676
-DIST aufs3-standalone-3_p20160822.tar.xz 3515768 BLAKE2B dd41a95d807a83aa958ff6e1e9d265b9ad8170ac4b93243ed73baa205fd80097172b5891d11fe30b13e78649d6bd58bb054ac179ee4c98dab7b76519e8678e91 SHA512 b3f6dc4883f565f73a81ff3aaf90bdca41419fe506c16b027e471e9901dce83a1e4d7a217574b686389433e2d7b280a53c0dbe805fad709f83cd5a689a53cc13
diff --git a/sys-fs/aufs3/aufs3-3_p20160219.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
deleted file mode 100644
index 8c40ec61abbe..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160219.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=18
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".25+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160223.ebuild b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
deleted file mode 100644
index 2a786f02ab2c..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160223.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=18
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".25+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160627.ebuild b/sys-fs/aufs3/aufs3-3_p20160627.ebuild
deleted file mode 100644
index 2a786f02ab2c..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160627.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=18
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".25+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160815.ebuild b/sys-fs/aufs3/aufs3-3_p20160815.ebuild
deleted file mode 100644
index 2a786f02ab2c..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160815.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=18
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".25+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160822.ebuild b/sys-fs/aufs3/aufs3-3_p20160822.ebuild
deleted file mode 100644
index 2a786f02ab2c..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160822.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=18
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".25+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/files/README.gentoo b/sys-fs/aufs3/files/README.gentoo
deleted file mode 100644
index 64dfe94b4bda..000000000000
--- a/sys-fs/aufs3/files/README.gentoo
+++ /dev/null
@@ -1,20 +0,0 @@
-There several other patches in aufs3. They are all
-optional. When you meet some problems, they will help you. You can find them
-in the documentation directory.
-
-	- aufs3-loopback.patch
-	  Supports a nested loopback mount in a branch-fs. This patch is
-	  unnecessary until aufs produces a message such like "you may want to try
-	  another patch for loopback file".
-
-	- vfs-ino.patch
-	  Modifies a system global kernel internal function get_next_ino() in
-	  order to stop assigning 0 for an inode-number. Not directly related to
-	  aufs, but recommended generally.
-
-	- tmpfs-idr.patch
-	  Keeps the tmpfs inode number as the lowest value. Effective to reduce
-	  the size of aufs XINO files for tmpfs branch. Also it prevents the
-	  duplication of inode number, which is important for backup
-	  tools, aubrsync or other utilities. When you find aufs XINO files for
-	  tmpfs branch growing too much, try this patch.
diff --git a/sys-fs/aufs3/files/pax-3.11.patch b/sys-fs/aufs3/files/pax-3.11.patch
deleted file mode 100644
index cf216a5708ca..000000000000
--- a/sys-fs/aufs3/files/pax-3.11.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/fs/aufs/dynop.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/dynop.c	2012-10-09 15:41:58.562989820 -0400
-@@ -149,9 +149,11 @@
- #define DySet(func, dst, src, h_op, h_sb) do {				\
- 	DyDbgInc(cnt);							\
- 	if (h_op->func) {						\
--		if (src.func)						\
--			dst.func = src.func;				\
--		else							\
-+		if (src.func) {						\
-+			pax_open_kernel();				\
-+			*(void **)&dst.func = src.func;			\
-+			pax_close_kernel();				\
-+		} else							\
- 			AuDbg("%s %s\n", au_sbtype(h_sb), #func);	\
- 	}								\
- } while (0)
-@@ -159,7 +161,9 @@
- #define DySetForce(func, dst, src) do {		\
- 	AuDebugOn(!src.func);			\
- 	DyDbgInc(cnt);				\
--	dst.func = src.func;			\
-+	pax_open_kernel();			\
-+	*(void **)&dst.func = src.func;		\
-+	pax_close_kernel();			\
- } while (0)
- 
- #define DySetAop(func) \
-@@ -266,15 +270,17 @@
-  */
- static void dy_adx(struct au_dyaop *dyaop, int do_dx)
- {
-+	pax_open_kernel();
- 	if (!do_dx) {
--		dyaop->da_op.direct_IO = NULL;
--		dyaop->da_op.get_xip_mem = NULL;
-+		*(void **)&dyaop->da_op.direct_IO = NULL;
-+		*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	} else {
--		dyaop->da_op.direct_IO = aufs_aop.direct_IO;
--		dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
-+		*(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
-+		*(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
- 		if (!dyaop->da_get_xip_mem)
--			dyaop->da_op.get_xip_mem = NULL;
-+			*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	}
-+	pax_close_kernel();
- }
- 
- static struct au_dyaop *dy_aget(struct au_branch *br,
---- a/fs/aufs/f_op_sp.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/f_op_sp.c	2012-10-09 15:41:58.562989820 -0400
-@@ -104,7 +104,7 @@
- static int aufs_open_sp(struct inode *inode, struct file *file);
- static struct au_sp_fop {
- 	int			done;
--	struct file_operations	fop;	/* not 'const' */
-+	file_operations_no_const	fop;	/* not 'const' */
- 	spinlock_t		spin;
- } au_sp_fop[AuSp_Last] = {
- 	[AuSp_FIFO] = {
-@@ -157,8 +157,10 @@
- 		h_file = au_hf_top(file);
- 		spin_lock(&p->spin);
- 		if (!p->done) {
--			p->fop = *h_file->f_op;
-+			pax_open_kernel();
-+			memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
- 			p->fop.owner = THIS_MODULE;
-+			pax_close_kernel();
- 			if (p->fop.aio_read)
- 				p->fop.aio_read = aufs_aio_read_sp;
- 			if (p->fop.aio_write)
---- a/fs/aufs/sysfs.c	2013-10-20 17:08:37.000000000 -0400
-+++ b/fs/aufs/sysfs.c	2013-10-19 17:08:29.000000000 -0400
-@@ -233,8 +233,10 @@
- 	for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
- 		attr = &br_sysfs->attr;
- 		sysfs_attr_init(attr);
--		attr->name = br_sysfs->name;
--		attr->mode = S_IRUGO;
-+		pax_open_kernel();
-+		*(void **)&attr->name = br_sysfs->name;
-+		*(void **)&attr->mode = S_IRUGO;
-+		pax_close_kernel();
- 		br_sysfs++;
- 	}
- }
diff --git a/sys-fs/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml
deleted file mode 100644
index f0e5c642768d..000000000000
--- a/sys-fs/aufs3/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="debug">Enable additional debugging support</flag>
-    <flag name="hfs">Enable hfs support</flag>
-    <flag name="fuse">Enable fuse support</flag>
-    <flag name="inotify">Enable inotify support</flag>
-    <flag name="kernel-patch">Patch the current kernel for aufs3 support</flag>
-    <flag name="nfs">Enable support for nfs export</flag>
-    <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
-    <flag name="ramfs">Enable initramfs/rootfs support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">aufs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
deleted file mode 100644
index d3fb157ba6f7..000000000000
--- a/sys-fs/aufs4/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 BLAKE2B 61a1059ddf1e7ea8338088f60f5b96112a723c18bedd508e8d35c89fc8354355b6db6ffc886d2fe09a12612b1fb790df7884315c6cfb0f60819f778b8db6f2af SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1
-DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 BLAKE2B 3aa9691be4fab031519d8f2b869d1225be9a6198d0a72efcf98b400a1cc220f2af7d32dc54228a52120c3cab3c887dc4e2b3b50f0f723a47a3da21219b0ed250 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e
-DIST aufs4-standalone-0_pre20160627.tar.xz 1427036 BLAKE2B 69774951cec10bbd49999818a470924503b71f95d55db390314764a340ce5fec345eea50eef14e8b34459164546b61ff908827b39f442d5c9b117d60be972587 SHA512 c2e3d92fc6ca8968071a40d2773b63ec21fdd2bb12e8375dced30279ffcafcd06cacb0c20a6bb5378704c5de670426d0d92149bb5737507e3515b5df648e1b81
-DIST aufs4-standalone-0_pre20160815.tar.xz 1648360 BLAKE2B 75c228d82cf0c652c1281b1b9f6d7c95505065e2df7546871192a27ef39427d48e52e8b4520f50251b435bf9e711bd77290b0d1afa35cd9660ef88224d7304d1 SHA512 a9a86ce4fce04100704cce1acf04b8eeff6a2b81cc591d3ceeafa736a3a8e8fed59538f9301af6cb3ec496dd914b81a3134669ba8871624b2266cc3f731b9fae
-DIST aufs4-standalone-0_pre20161010.tar.xz 1635556 BLAKE2B daae9be780c82ba44c94b5cd089f445e51df3a887987996d2bbb6285d65dfb210c75ef8aa8e217465330f43da71561cc7347eefbf1930da57f65d5c96950a2ff SHA512 520f47255ee33762f111f93ceeaaee9cf6136c13fb6968a7a7d49388c189e112875f076c5fecdad2123d137a2bc0b74e9c0e6e8913e75dfede30e7a65dd74616
-DIST aufs4-standalone-0_pre20161219.tar.xz 1823772 BLAKE2B 70ca052e2c8e716ef2c0921bab13b77d40126e49892d521dfec93b6b67518cbc6ae44293cfdc3fafa308b67e5d242ed319efe71f733c5ef3f128da682ad1edd2 SHA512 59fc0df19716d8f03e2547d98d6f412e921576d60afd783e5691a07c09b298ee61f491501e07ec154665a56d11b1887f94813ef5972254e6391251a48ba156c9
-DIST aufs4-standalone-0_pre20170130.tar.xz 1761280 BLAKE2B 7803ad55a6e10209554b359d8225e5f3208214fb011b3fb812b4a839e142a0611172268200e5b688bd233a4b1f8cbee7271a278da489759c1de574ec5da742af SHA512 beb121b36bb6056e48d5402b10bdfb8b6cd20d61b7d74221e5abd10226f58f40be1a0853e06a09cc1f94d50543030a9fd0a1c117570b1ad7467bf4156a1492ea
-DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 BLAKE2B 4db987bf926eca1d5d6e5c8cf9dc447f5d10c80575aac21504647ae490f4aa806f443dd2f9350451f02d3beb5bbd5f498133746ccf6ffc2738d508f242d7a8e0 SHA512 c68cf12573a0f3d9ec9419c63759d2b6f120eaafbbc005553c31d9c07b77d61612b903dc7ebdb2a8de8a52ded62e20b08cd32206b3cd3df196f0c1da82d472f7
-DIST aufs4-standalone-0_pre20170313.tar.xz 1883012 BLAKE2B 46ac87644085ece9f6a98043bd1cbc5f386d08a30227a16f798d68a69c0df7d7468ffafae1a41f757b56903ee8f3df900d45dfecb40b2069c6cd52f38f39cc8a SHA512 7d711e0ebdc38aa79d3b7cdb04c91f3029c233bacdadca87a8622d48826c261c678d6a2cda6b627a0db0f248b35448e0d9da30e2c8e2e42e3b1e3ae6327033ba
-DIST aufs4-standalone-0_pre20170612.tar.xz 2017248 BLAKE2B 40fa98545d6ddd3685f9c56f7dc921f2215c451ed68e84720f30a196b7c10660b0930d12a110ef6c65364433a121a90b21eedadc8b5a2007217cbe0468100509 SHA512 2d0fd1dce7b1a421533e667420fc69a44c378753dccddc3768eebdb906a023e41378b38961004a58b1c4f2e3844c86f8cb4be238e634318a380881eab513acfa
-DIST aufs4-standalone-0_pre20171002.tar.xz 2265048 BLAKE2B ae68812c547411bebd7e169e3bfa840536386a3cfdd876473f167372ec716c7df620329438c9024b185bb302d2053df5ded7026342a166d68187dc756a6e9560 SHA512 ee9d0e48fba6671fe4c5d3f533956c3eb0c6caa45fc4074be94f4427d84a5446cd4dc9f3ebf27fb56e697b24172ddd14a61c246f0414ebce8e372c204dfbb150
-DIST aufs4-standalone-0_pre20171106.tar.xz 2351120 BLAKE2B e29209475da3c39188eb9ec88bf91cd50d7d882fdd234e32e28741b500aa85427e98a23528a297f35562f81dc4f8e4932783917644b2eda0b4f2744ac15b700e SHA512 9a8c6f59b737133e423613365bb46fd197f05a93d459b6206a70807ffaa6763b7095b2f4780deb6e7882a2b464aaa185cf1760febbf3a674e8d0cf71c7ba72ee
-DIST aufs4-standalone-0_pre20180219.tar.xz 2496676 BLAKE2B 61015534f74f9f2398b79643d9528c59f0069fefae3bf9382eea1f31db69fe22195ce8a929e2c25285b41fdc070d7f255effb6d408d3997d61dd83beda544452 SHA512 b667be0c2c2b9bcef66f81839364fa56871c2577b9b2389f0464b669a1404fd68928522bb5b3eb4c114b21b6e86201fb50eeaf167d194de187f305ebc0b75cb7
-DIST aufs4-standalone-0_pre20180312.tar.xz 2521856 BLAKE2B e226a6ba530fe9423d1671cee59501445cbc70419801420f6c5eb8c5fd3af3cce9301d9d32042ea8c4c704a847b4f46bd006c397871f7c9ee5dcb4e92c3ce7e9 SHA512 60e1dfb703706f21928645c51d1a4138187e7ea44d86ca5f2ee8a991a910974bc514340237a7c51397d658ca56e2cf32cfcf374eb8e060073266042e5ee42cee
diff --git a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
deleted file mode 100644
index cb3b25bc99ab..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=4
-# highest supported version
-KERN_MAX_VER=5
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
deleted file mode 100644
index cb3b25bc99ab..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=4
-# highest supported version
-KERN_MAX_VER=5
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild b/sys-fs/aufs4/aufs4-0_pre20160627.ebuild
deleted file mode 100644
index 2ce209aa7456..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=5
-# highest supported version
-KERN_MAX_VER=6
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild b/sys-fs/aufs4/aufs4-0_pre20160815.ebuild
deleted file mode 100644
index 2ce209aa7456..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=5
-# highest supported version
-KERN_MAX_VER=6
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild b/sys-fs/aufs4/aufs4-0_pre20161010.ebuild
deleted file mode 100644
index 74da974872fd..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=8
-# highest supported version
-KERN_MAX_VER=9
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild b/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
deleted file mode 100644
index 74da974872fd..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=8
-# highest supported version
-KERN_MAX_VER=9
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild b/sys-fs/aufs4/aufs4-0_pre20170130.ebuild
deleted file mode 100644
index ff94ecb3cd1c..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=9
-# highest supported version
-KERN_MAX_VER=10
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild b/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
deleted file mode 100644
index ff94ecb3cd1c..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=9
-# highest supported version
-KERN_MAX_VER=10
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild b/sys-fs/aufs4/aufs4-0_pre20170313.ebuild
deleted file mode 100644
index 0be383f2e126..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=9
-# highest supported version
-KERN_MAX_VER=11
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild b/sys-fs/aufs4/aufs4-0_pre20170612.ebuild
deleted file mode 100644
index 551496bccb00..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=10
-# highest supported version
-KERN_MAX_VER=11
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild b/sys-fs/aufs4/aufs4-0_pre20171002.ebuild
deleted file mode 100644
index 2f61f36acc1d..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=13
-# highest supported version
-KERN_MAX_VER=14
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild b/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
deleted file mode 100644
index 2f61f36acc1d..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=13
-# highest supported version
-KERN_MAX_VER=14
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild b/sys-fs/aufs4/aufs4-0_pre20180219.ebuild
deleted file mode 100644
index f2e2ccc44e69..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=13
-# highest supported version
-KERN_MAX_VER=15
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild b/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
deleted file mode 100644
index 1917bdd71b81..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=13
-# highest supported version
-KERN_MAX_VER=16
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" \
-		&& ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is
-	# possible w/out a kernel unpacked on the system
-	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
-		die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".13+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null || die
-	unpack ${A}
-
-	cd ${PN}-standalone || die
-
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-
-	combinediff \
-		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
-	combinediff \
-		"${T}"/combined-1.patch ${PN}-mmap.patch \
-		> ${PN}-standalone-base-mmap-combined.patch
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch \
-				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
-				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
-				> /dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
-			die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
-
-	sed \
-		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
-		-i Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use doc && dodoc -r Documentation
-
-	use kernel-patch || \
-		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc \
-		Documentation/filesystems/aufs/README \
-		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/files/README.gentoo b/sys-fs/aufs4/files/README.gentoo
deleted file mode 100644
index 64dfe94b4bda..000000000000
--- a/sys-fs/aufs4/files/README.gentoo
+++ /dev/null
@@ -1,20 +0,0 @@
-There several other patches in aufs3. They are all
-optional. When you meet some problems, they will help you. You can find them
-in the documentation directory.
-
-	- aufs3-loopback.patch
-	  Supports a nested loopback mount in a branch-fs. This patch is
-	  unnecessary until aufs produces a message such like "you may want to try
-	  another patch for loopback file".
-
-	- vfs-ino.patch
-	  Modifies a system global kernel internal function get_next_ino() in
-	  order to stop assigning 0 for an inode-number. Not directly related to
-	  aufs, but recommended generally.
-
-	- tmpfs-idr.patch
-	  Keeps the tmpfs inode number as the lowest value. Effective to reduce
-	  the size of aufs XINO files for tmpfs branch. Also it prevents the
-	  duplication of inode number, which is important for backup
-	  tools, aubrsync or other utilities. When you find aufs XINO files for
-	  tmpfs branch growing too much, try this patch.
diff --git a/sys-fs/aufs4/files/pax-4.patch b/sys-fs/aufs4/files/pax-4.patch
deleted file mode 100644
index cf216a5708ca..000000000000
--- a/sys-fs/aufs4/files/pax-4.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/fs/aufs/dynop.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/dynop.c	2012-10-09 15:41:58.562989820 -0400
-@@ -149,9 +149,11 @@
- #define DySet(func, dst, src, h_op, h_sb) do {				\
- 	DyDbgInc(cnt);							\
- 	if (h_op->func) {						\
--		if (src.func)						\
--			dst.func = src.func;				\
--		else							\
-+		if (src.func) {						\
-+			pax_open_kernel();				\
-+			*(void **)&dst.func = src.func;			\
-+			pax_close_kernel();				\
-+		} else							\
- 			AuDbg("%s %s\n", au_sbtype(h_sb), #func);	\
- 	}								\
- } while (0)
-@@ -159,7 +161,9 @@
- #define DySetForce(func, dst, src) do {		\
- 	AuDebugOn(!src.func);			\
- 	DyDbgInc(cnt);				\
--	dst.func = src.func;			\
-+	pax_open_kernel();			\
-+	*(void **)&dst.func = src.func;		\
-+	pax_close_kernel();			\
- } while (0)
- 
- #define DySetAop(func) \
-@@ -266,15 +270,17 @@
-  */
- static void dy_adx(struct au_dyaop *dyaop, int do_dx)
- {
-+	pax_open_kernel();
- 	if (!do_dx) {
--		dyaop->da_op.direct_IO = NULL;
--		dyaop->da_op.get_xip_mem = NULL;
-+		*(void **)&dyaop->da_op.direct_IO = NULL;
-+		*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	} else {
--		dyaop->da_op.direct_IO = aufs_aop.direct_IO;
--		dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
-+		*(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
-+		*(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
- 		if (!dyaop->da_get_xip_mem)
--			dyaop->da_op.get_xip_mem = NULL;
-+			*(void **)&dyaop->da_op.get_xip_mem = NULL;
- 	}
-+	pax_close_kernel();
- }
- 
- static struct au_dyaop *dy_aget(struct au_branch *br,
---- a/fs/aufs/f_op_sp.c	2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/f_op_sp.c	2012-10-09 15:41:58.562989820 -0400
-@@ -104,7 +104,7 @@
- static int aufs_open_sp(struct inode *inode, struct file *file);
- static struct au_sp_fop {
- 	int			done;
--	struct file_operations	fop;	/* not 'const' */
-+	file_operations_no_const	fop;	/* not 'const' */
- 	spinlock_t		spin;
- } au_sp_fop[AuSp_Last] = {
- 	[AuSp_FIFO] = {
-@@ -157,8 +157,10 @@
- 		h_file = au_hf_top(file);
- 		spin_lock(&p->spin);
- 		if (!p->done) {
--			p->fop = *h_file->f_op;
-+			pax_open_kernel();
-+			memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
- 			p->fop.owner = THIS_MODULE;
-+			pax_close_kernel();
- 			if (p->fop.aio_read)
- 				p->fop.aio_read = aufs_aio_read_sp;
- 			if (p->fop.aio_write)
---- a/fs/aufs/sysfs.c	2013-10-20 17:08:37.000000000 -0400
-+++ b/fs/aufs/sysfs.c	2013-10-19 17:08:29.000000000 -0400
-@@ -233,8 +233,10 @@
- 	for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
- 		attr = &br_sysfs->attr;
- 		sysfs_attr_init(attr);
--		attr->name = br_sysfs->name;
--		attr->mode = S_IRUGO;
-+		pax_open_kernel();
-+		*(void **)&attr->name = br_sysfs->name;
-+		*(void **)&attr->mode = S_IRUGO;
-+		pax_close_kernel();
- 		br_sysfs++;
- 	}
- }
diff --git a/sys-fs/aufs4/metadata.xml b/sys-fs/aufs4/metadata.xml
deleted file mode 100644
index f0e5c642768d..000000000000
--- a/sys-fs/aufs4/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="debug">Enable additional debugging support</flag>
-    <flag name="hfs">Enable hfs support</flag>
-    <flag name="fuse">Enable fuse support</flag>
-    <flag name="inotify">Enable inotify support</flag>
-    <flag name="kernel-patch">Patch the current kernel for aufs3 support</flag>
-    <flag name="nfs">Enable support for nfs export</flag>
-    <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
-    <flag name="ramfs">Enable initramfs/rootfs support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">aufs</remote-id>
-  </upstream>
-</pkgmetadata>
author	Repository mirror & CI <repomirrorci@gentoo.org>	2018-07-28 12:04:08 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2018-07-28 12:04:08 +0000
commit	4b4a05f860b135ab82a9179d471764154b0e4287 (patch)
tree	dfc8b310c9a915164f3e49ec1019365cc5ddfaad
parent	2018-07-28 11:44:24 UTC (diff)
parent	app-misc/wyrd: Remove last-rited pkg (diff)
download	gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.tar.gz gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.tar.bz2 gentoo-4b4a05f860b135ab82a9179d471764154b0e4287.zip