[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Mike Frysinger]

commit:     66c91ec0f10bebefa0460c84ec2fb86300a5fd81
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 08:12:51 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 08:12:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c91ec0

sys-apps/qingy: add epatch_user support #510738

 sys-apps/qingy/qingy-1.0.0-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/qingy/qingy-1.0.0-r2.ebuild b/sys-apps/qingy/qingy-1.0.0-r2.ebuild
index 7dbd955..5972119 100644
--- a/sys-apps/qingy/qingy-1.0.0-r2.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r2.ebuild
@@ -47,6 +47,7 @@ src_prepare() {
 	epatch "${DISTDIR}"/${P}-screensavers.patch.gz
 	# bug #372675 - fix from upstream
 	epatch "${DISTDIR}"/${P}-consolekit-pam.patch.gz
+	epatch_user #510738
 	eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Tim Harder]

commit:     03134eba9a14fb5100c1329ba030cd89646c5837
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 06:32:49 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 06:32:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03134eba

sys-apps/qingy: remove old

 sys-apps/qingy/qingy-1.0.0-r1.ebuild | 132 -----------------------------------
 sys-apps/qingy/qingy-1.0.0.ebuild    | 125 ---------------------------------
 2 files changed, 257 deletions(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r1.ebuild b/sys-apps/qingy/qingy-1.0.0-r1.ebuild
deleted file mode 100644
index f756eaa..00000000
--- a/sys-apps/qingy/qingy-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools elisp-common eutils pam
-
-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
-	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
-}
-
-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.ebuild b/sys-apps/qingy/qingy-1.0.0.ebuild
deleted file mode 100644
index 316c199..00000000
--- a/sys-apps/qingy/qingy-1.0.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools elisp-common eutils pam
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="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}
-	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
-	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 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
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Thomas Deutschmann]

commit:     a88802479c1e4a608a94f5c911668783987ff74d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 06:13:15 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 06:45:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8880247

sys-apps/qingy: x86 stable (bug #642510)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/qingy/qingy-1.0.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
index dc95a4a0d2b..656331e6c7e 100644
--- a/sys-apps/qingy/qingy-1.0.0-r3.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Agostino Sarubbo]

commit:     93f3e0e45467ba50d913fc92f09526f8d8a69ff7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 14:29:24 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 14:30:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f3e0e4

sys-apps/qingy: amd64 stable wrt bug #642510

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 sys-apps/qingy/qingy-1.0.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
index 656331e6c7e..d478b600b05 100644
--- a/sys-apps/qingy/qingy-1.0.0-r3.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Sergei Trofimovich]

commit:     49903ebfe73dc840575fc255f7ad997bd5bafdd1
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 23:01:54 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 23:01:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49903ebf

sys-apps/qingy: stable 1.0.0-r3 for ppc, bug #642510

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 sys-apps/qingy/qingy-1.0.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
index d478b600b05..46166334038 100644
--- a/sys-apps/qingy/qingy-1.0.0-r3.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Matt Turner]

commit:     e1ceef0cbad05d8ba501cdd10be4e2b77a29c85e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 00:38:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 00:52:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ceef0c

sys-apps/qingy: Drop unnecessary x11-proto dep

x11-libs/libXScrnSaver has this in RDEPEND, so it's guaranteed to be
installed.

 sys-apps/qingy/{qingy-1.0.0-r3.ebuild => qingy-1.0.0-r4.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r3.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
similarity index 99%
rename from sys-apps/qingy/qingy-1.0.0-r3.ebuild
rename to sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 46166334038..88a2eaffd69 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}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Matt Turner]

commit:     e2ce4d3855b4d7e1b4a559f6a3c1fd4ea7774b63
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 00:36:25 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 00:52:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ce4d38

sys-apps/qingy: Drop old version

 sys-apps/qingy/qingy-1.0.0-r2.ebuild | 134 -----------------------------------
 1 file changed, 134 deletions(-)

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 e07aaae10bf..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Ulrich Müller]

commit:     72d5983e2bf8eaf8cba80a845828388f70d7d18a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 16:34:37 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 22:48:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d5983e

sys-apps/qingy: Update virtual/emacs dependency.

The virtual is deprecated, depend on app-editors/emacs instead.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-apps/qingy/qingy-1.0.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 88a2eaffd69..5bdb362f4cc 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
 	opensslcrypt? ( dev-libs/openssl:0= )
 	crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	pam? ( >=sys-libs/pam-0.75-r11 )
 	X? (
 		x11-libs/libX11:=

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Mikle Kolyada]

commit:     1c515d4701933133b8cc338f7d138659aba82a29
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 19:23:03 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 19:23:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c515d47

sys-apps/qingy: remove consolekit support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-apps/qingy/Manifest              |  1 -
 sys-apps/qingy/metadata.xml          |  1 -
 sys-apps/qingy/qingy-1.0.0-r4.ebuild | 13 +++----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index d9ed9eafa5d..94c7f6f964a 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -1,4 +1,3 @@
-DIST qingy-1.0.0-consolekit-pam.patch.gz 9263 BLAKE2B 2b20b6c0a6be7f20154f2a36d1bcbe7741adb94e8486b81ccb4f9289f6aca7c33081b950f282e6aa0a68b2d23e6235918931faaf05666a4226666600f6b19d3d SHA512 e69743173ea0ff27265dca789f4203b58c271ec6acfeac1ffd87738a3a693f1393778ca70be5d0c8a3e461edfa350047cef3941d8e85679f7c930f3b63c1eeb1
 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

diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index a5a65bc91a7..6d78e724dd6 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="consolekit">Enable native consolekit support</flag>
 	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
 </use>
 <upstream>

diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
index 5bdb362f4cc..2aae7adf571 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,13 +10,12 @@ 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"
+	https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/${P}-screensavers.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="consolekit crypt emacs gpm opensslcrypt pam static X"
+IUSE="crypt emacs gpm opensslcrypt pam static X"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
@@ -34,9 +33,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${RDEPEND}
-	consolekit? (
-		sys-auth/consolekit
-		sys-apps/dbus )
 	pam? ( sys-auth/pambase )
 "
 
@@ -46,8 +42,6 @@ src_prepare() {
 	eapply "${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
 	default
 	mv configure.in configure.ac || die
 	eautoreconf
@@ -72,7 +66,6 @@ src_configure() {
 		--disable-optimizations \
 		--disable-static \
 		--disable-DirectFB-support \
-		$(use_enable consolekit) \
 		$(use_enable pam) \
 		$(use_enable static static-build) \
 		$(use_enable gpm gpm-lock) \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Mikle Kolyada]

commit:     6f8567d4f320824d8b514774d38daa030dbe9e21
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 17:42:31 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:42:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8567d4

sys-apps/qingy: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-apps/qingy/{qingy-1.0.0-r4.ebuild => qingy-1.0.0-r5.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
similarity index 96%
rename from sys-apps/qingy/qingy-1.0.0-r4.ebuild
rename to sys-apps/qingy/qingy-1.0.0-r5.ebuild
index 2aae7adf571..0b1c6141e41 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,7 +101,10 @@ src_install() {
 	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
 	rm "${D}"/etc/pam.d/qingy
-	pamd_mimic system-local-login qingy auth account password session
+
+	if use pam; then
+		pamd_mimic system-local-login qingy auth account password session
+	fi
 
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[David Seifert]

commit:     b1988966d0d8dd4e957d3b94db02ee67ba773216
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 13 10:14:02 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 10:14:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1988966

sys-apps/qingy: Apply gcc-10 workaround

Closes: https://github.com/gentoo/gentoo/pull/19409
Closes: https://bugs.gentoo.org/707622
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/qingy/qingy-1.0.0-r5.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index 0b1c6141e41..c842ba0889c 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools elisp-common eutils pam systemd
+
+inherit autotools elisp-common eutils flag-o-matic pam systemd
 
 GENTOO_THEME_VERSION="2.1"
 
@@ -48,6 +49,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local crypto_support="--disable-crypto"
 	local emacs_support="--disable-emacs --without-lispdir"
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Sam James]

commit:     081116f4001eac66b298557d200d93e4201ddd53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 14:01:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 19:01:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=081116f4

sys-apps/qingy: eutils->epatch

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/qingy/qingy-1.0.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index c842ba0889c..d69f2be4d3c 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools elisp-common eutils flag-o-matic pam systemd
+inherit autotools elisp-common epatch flag-o-matic pam systemd
 
 GENTOO_THEME_VERSION="2.1"
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[David Seifert]

commit:     2c330471c1bd59961405ee2215db5f7757308f4f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 13:51:51 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 13:51:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c330471

sys-apps/qingy: remove sys-apps/sed from DEPEND

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/qingy/qingy-1.0.0-r5.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index d69f2be4d3c7..8d1f43027b02 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.1.4-r1
 	virtual/pkgconfig
 "
 RDEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/qingy/

[Sam James]

commit:     0b9828a5805f807e44f5eccb28222ed5f5a427db
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 10:50:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 10:50:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9828a5

sys-apps/qingy: EAPI 8, use libgcrypt for OpenSSL 3 compatibility

Closes: https://bugs.gentoo.org/854564
Closes: https://bugs.gentoo.org/768279
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/qingy/metadata.xml                        | 17 ++--
 ...qingy-1.0.0-r5.ebuild => qingy-1.0.0-r6.ebuild} | 90 +++++++++++-----------
 2 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index 21101f532d82..ff40f99a6e5b 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
-</use>
-<upstream>
-	<remote-id type="sourceforge">qingy</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qingy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r6.ebuild
similarity index 55%
rename from sys-apps/qingy/qingy-1.0.0-r5.ebuild
rename to sys-apps/qingy/qingy-1.0.0-r6.ebuild
index 8d1f43027b02..3c0a19cf677b 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r6.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools elisp-common epatch flag-o-matic pam systemd
+inherit autotools elisp-common flag-o-matic 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
+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}-screensavers.patch.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="crypt emacs gpm opensslcrypt pam static X"
+IUSE="crypt emacs gpm pam static X"
 
-RDEPEND="
+DEPEND="
 	>=sys-libs/ncurses-5.7-r7:=
-	opensslcrypt? ( dev-libs/openssl:0= )
-	crypt? ( >=dev-libs/libgcrypt-1.2.1:0= )
+	crypt? ( >=dev-libs/libgcrypt-1.2.1:= )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	pam? ( >=sys-libs/pam-0.75-r11 )
 	X? (
@@ -29,50 +30,46 @@ RDEPEND="
 		x11-libs/libXScrnSaver:=
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${RDEPEND}
+RDEPEND="
+	${RDEPEND}
 	pam? ( sys-auth/pambase )
 "
+BDEPEND="virtual/pkgconfig"
 
 SITEFILE="50${PN}-gentoo.el"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-tinfo.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch
 	# bug #359637 and bug #462634 - fixes from upstream
-	epatch "${DISTDIR}"/${P}-screensavers.patch.gz
+	"${WORKDIR}"/${P}-screensavers.patch
+)
+
+src_prepare() {
 	default
+
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
 	append-cflags -fcommon
-	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
+	local myeconfargs=(
+		--sbindir=/sbin
+		--with-lispdir="${SITELISP}"/${PN}
+		--disable-optimizations
+		--disable-static
+		--disable-DirectFB-support
+
+		$(use_enable emacs)
+		$(use_enable pam)
+		$(use_enable static static-build)
+		$(use_enable gpm gpm-lock)
+		$(use_enable X x-support)
+		$(use_enable crypt crypto libgcrypt)
+	)
 
-	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 \
-		--disable-static \
-		--disable-DirectFB-support \
-		$(use_enable pam) \
-		$(use_enable static static-build) \
-		$(use_enable gpm gpm-lock) \
-		$(use_enable X x-support) \
-		${crypto_support} \
-		${emacs_support}
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -82,18 +79,19 @@ src_install() {
 
 	# Install the program
 	default
-	find "${D}" -name '*.la' -delete || die
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# 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
+	fperms 600 /etc/qingy/settings
 
 	# Install Gentoo theme
 	dodir /usr/share/${PN}/themes/gentoo
-	cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die
+	cp "${WORKDIR}"/gentoo/* "${ED}"/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
+	sed -i 's/theme = "default"/theme = "gentoo"/' "${ED}"/etc/${PN}/settings || die
 
 	# Install log rotation policy
 	insinto /etc/logrotate.d
@@ -101,7 +99,7 @@ src_install() {
 
 	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
-	rm "${D}"/etc/pam.d/qingy
+	rm "${ED}"/etc/pam.d/qingy || die
 
 	if use pam; then
 		pamd_mimic system-local-login qingy auth account password session
@@ -111,11 +109,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "In order to use qingy you must first edit your /etc/inittab"
+	einfo "In order to use qingy you must first edit your ${EROOT}/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 "Also, make sure to adjust qingy settings file (${EROOT}/etc/qingy/settings)"
 	einfo "to your preferences/machine configuration..."
 
 	if use crypt; then
@@ -124,8 +122,8 @@ pkg_postinst() {
 		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..."
+		ewarn "message. If this is your case, please remove ${EROOT}/etc/qingy/public_key"
+		ewarn "and ${EROOT}/etc/qingy/private_key and run qingy-keygen again..."
 	fi
 
 	use emacs && echo && elisp-site-regen