gentoo resync : 28.04.2018

3 files changed, 1 insertions, 137 deletions

diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index 372b8f5a5613..3f0af5d034ec 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -6,6 +6,5 @@ DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r2.ebuild 4075 BLAKE2B 271d6f850551bebee5a83ea6c2471756de0d27a08be77ecf2860dc1d62b16e13d835e3f801e0a92c350ffdd77ea0ed4dc73f0443c71aa5c5aef70f85ca0eed12 SHA512 cc848a116d0dbbb728f385a0c6e3119c618a7584e10d41580cc35fcea2cfeb22a2fe1633cc8adc712a4b08a8fdfa2f5a26e118e7ffd342db02f22cb242776d39
-EBUILD qingy-1.0.0-r3.ebuild 4061 BLAKE2B 7abde2a2ec840aef75a207eae62e9027c25ac4e5b660eaa757744e399cba4df6019d84f7a963c444da793eef8be915dc8baca2f50da3395d3ddc4284f237a8ae SHA512 4f8f428ebb4b42009202f30d305c8090157bef73aed3081cdd4367a569d7d354fa2eb45fd953da3242dd62b8e3616e878562c976e8526c00b8f47739d8b68033
+EBUILD qingy-1.0.0-r4.ebuild 4034 BLAKE2B ad656aae0d318cf00b7a372207adeb05970c4bb148316cce7797eee80b9648dadc300d88c0e89449670cfd734dfaba6c969e5ce8875ec4d240cf8197b771fa51 SHA512 5f134f29dcb81ec7e60d6f85ae502061dfda765f76d6f8ae7969333a2f64013bb5ba6f9a42496e5cf3cc8824542185dca2c4ba76084b4cc19a71828fa9d0495a
 MISC metadata.xml 520 BLAKE2B 283f63386d116aae632026bf5bd61178022ac58d2a76a54087a42934bb9db1d714b0e14ebfaf74c48dfdc2ffd8505068a45fe2c2fca9446b33a2f48445f98458 SHA512 675beb88cd98c9e5e9c94b3292bf82aa91b1c17178b0718b0fc282202127b8fc0d58062f31ed4cd927aac4614dd3f975594a60fb293f3359e788cc8a2d1b8485
diff --git a/sys-apps/qingy/qingy-1.0.0-r2.ebuild b/sys-apps/qingy/qingy-1.0.0-r2.ebuild
deleted file mode 100644
index e07aaae10bf2..000000000000
--- a/sys-apps/qingy/qingy-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools elisp-common eutils pam systemd
-
-GENTOO_THEME_VERSION=2.1
-
-DESCRIPTION="a DirectFB getty replacement"
-HOMEPAGE="http://qingy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}-gentoo-theme-${GENTOO_THEME_VERSION}.tar.bz2
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz
-	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-consolekit-pam.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="consolekit crypt directfb emacs gpm opensslcrypt pam static X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:=
-	opensslcrypt? ( dev-libs/openssl:0= )
-	crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
-	directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] )
-	emacs? ( virtual/emacs )
-	pam? ( >=sys-libs/pam-0.75-r11 )
-	X? (
-		x11-libs/libX11:=
-		x11-libs/libXScrnSaver:=
-		x11-proto/scrnsaverproto
-	)"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.1.4-r1
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	consolekit? (
-		sys-auth/consolekit
-		sys-apps/dbus )
-	pam? ( sys-auth/pambase )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	# bug #359637 and bug #462634 - fixes from upstream
-	epatch "${DISTDIR}"/${P}-screensavers.patch.gz
-	# bug #372675 - fix from upstream
-	epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
-	epatch_user #510738
-	eautoreconf
-}
-
-src_configure() {
-	local crypto_support="--disable-crypto"
-	local emacs_support="--disable-emacs --without-lispdir"
-
-	if use crypt && use opensslcrypt; then
-		echo
-		ewarn "You can have openssl or libgcrypt as a crypto library, not both."
-		ewarn "Using libgcrypt now..."
-		echo
-	fi
-
-	use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
-	use opensslcrypt && crypto_support="--enable-crypto=openssl"
-	use crypt && crypto_support="--enable-crypto=libgcrypt"
-	econf \
-		--sbindir=/sbin \
-		--disable-optimizations \
-		$(use_enable consolekit) \
-		$(use_enable pam) \
-		$(use_enable static static-build) \
-		$(use_enable gpm gpm-lock) \
-		$(use_enable X x-support) \
-		$(use_enable directfb DirectFB-support ) \
-		${crypto_support} \
-		${emacs_support}
-}
-
-src_install() {
-	# Copy documentation manually as make install only installs info files
-	# INSTALL is left because it contains also configuration informations
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
-
-	# Install the program
-	emake DESTDIR="${D}" install
-
-	# Set the settings file umask to 600, in case somebody
-	# wants to make use of the autologin feature
-	/bin/chmod 600 "${D}"/etc/qingy/settings
-
-	# Install Gentoo theme
-	dodir /usr/share/${PN}/themes/gentoo
-	cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die
-
-	# Alter config file so that it uses our theme
-	sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings
-
-	# Install log rotation policy
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-logrotate ${PN}
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-	rm "${D}"/etc/pam.d/qingy
-	pamd_mimic system-local-login qingy auth account password session
-
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-}
-
-pkg_postinst() {
-	einfo "In order to use qingy you must first edit your /etc/inittab"
-	einfo "Check the documentation at ${HOMEPAGE}"
-	einfo "for instructions on how to do that."
-	echo
-	einfo "Also, make sure to adjust qingy settings file (/etc/qingy/settings)"
-	einfo "to your preferences/machine configuration..."
-
-	if use crypt; then
-		echo
-		einfo "You will have to create a key pair using 'qingy-keygen'"
-		echo
-		ewarn "Note that sometimes a generated key-pair may pass the internal tests"
-		ewarn "but fail to work properly. You will get a 'regenerate your keys'"
-		ewarn "message. If this is your case, please remove /etc/qingy/public_key"
-		ewarn "and /etc/qingy/private_key and run qingy-keygen again..."
-	fi
-
-	use emacs && echo && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 461663340383..88a2eaffd690 100644
--- a/sys-apps/qingy/qingy-1.0.0-r3.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
@@ -27,7 +27,6 @@ RDEPEND="
 	X? (
 		x11-libs/libX11:=
 		x11-libs/libXScrnSaver:=
-		x11-proto/scrnsaverproto
 	)
 "
 DEPEND="${RDEPEND}