diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index af968c0dfedd8..18776afe34ff4 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1 @@
-DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749
-DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231
 DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
deleted file mode 100644
index b69e197832004..0000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- xscreensaver-5.21/driver/XScreenSaver.ad.in
-+++ xscreensaver-5.21/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -62,7 +62,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		http://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -122,7 +122,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:           %x %X
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- xscreensaver-5.21/hacks/barcode.c
-+++ xscreensaver-5.21/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- xscreensaver-5.21/hacks/glx/glsnake.c
-+++ xscreensaver-5.21/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
deleted file mode 100644
index 90786229102bb..0000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.21-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
deleted file mode 100644
index 3a4a844afcd6b..0000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}