Revision bump, with updated pamfile. Closes bug #210829. Wiped out oldest version.

(Portage version: 2.1.4.4)

4 files changed, 170 insertions, 95 deletions

diff --git a/sys-apps/qingy/ChangeLog b/sys-apps/qingy/ChangeLog
index 16f5ad05bbfa..562f05eda688 100644
--- a/sys-apps/qingy/ChangeLog
+++ b/sys-apps/qingy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/qingy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.46 2007/11/22 17:07:35 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.47 2008/04/03 14:54:13 s4t4n Exp $
+
+*qingy-0.9.6-r2 (03 Apr 2008)
+
+  03 Apr 2008; Michele Noberasco <s4t4n@gentoo.org> qingy-0.9.6-r2.ebuild:
+  Revision bump, with updated PAM file. Closes bug #210829.
+  qingy-0.7.4.ebuild:
+  Wiped out oldest release.
 
   22 Nov 2007; Samuli Suominen <drac@gentoo.org> qingy-0.9.6-r1.ebuild:
   amd64 stable as requested and tested by Emil Karlson
diff --git a/sys-apps/qingy/files/qingy-pamfile b/sys-apps/qingy/files/qingy-pamfile
new file mode 100644
index 000000000000..743b2f0260d6
--- /dev/null
+++ b/sys-apps/qingy/files/qingy-pamfile
@@ -0,0 +1,8 @@
+#%PAM-1.0 
+
+auth       sufficient	pam_rootok.so
+auth       required		pam_permit.so
+
+account    include		system-auth
+
+password   required		pam_permit.so
diff --git a/sys-apps/qingy/qingy-0.7.4.ebuild b/sys-apps/qingy/qingy-0.7.4.ebuild
deleted file mode 100644
index 92aab9f1f0e7..000000000000
--- a/sys-apps/qingy/qingy-0.7.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.7.4.ebuild,v 1.8 2007/07/22 06:25:37 dberkholz Exp $
-
-DESCRIPTION="a DirectFB getty replacement"
-HOMEPAGE="http://qingy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="crypt emacs gpm opensslcrypt pam static"
-
-RDEPEND=">=dev-libs/DirectFB-0.9.18
-	opensslcrypt? ( >=dev-libs/openssl-0.9.7e )
-	crypt?        ( >=dev-libs/libgcrypt-1.2.1 )
-	emacs?        ( virtual/emacs )
-	pam?          ( >=sys-libs/pam-0.75-r11 )
-	>=sys-libs/ncurses-5.4-r6
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-proto/scrnsaverproto"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-src_unpack()
-{
-	if use opensslcrypt && use crypt; then
-		echo
-		eerror "You can have openssl or libgcrypt as a crypto library, not both."
-		eerror "Please check your USE flags..."
-		echo
-		die "USE flags check failed"
-	fi
-
-	unpack ${A}
-}
-
-src_compile()
-{
-	local crypto_support="--disable-crypto"
-
-	use opensslcrypt && crypto_support="--enable-crypto=openssl"
-	use crypt        && crypto_support="--enable-crypto=libgcrypt"
-
-	econf                                \
-		--sbindir=/sbin                  \
-		--disable-optimizations          \
-		`use_enable emacs`               \
-		`use_enable pam`                 \
-		`use_enable static static-build` \
-		`use_enable gpm gpm-lock`        \
-		${crypto_support}                \
-	|| die "Configuration failed"
-
-	emake || die "Compilation failed"
-}
-
-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
-
-	# and finally install the program
-	make DESTDIR=${D} install || die "Installation failed"
-
-	# 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
-
-	# Replace qingy pam file with a more up-to-date one: see bug #155205
-	cp ${FILESDIR}/qingy-pam ${D}/etc/pam.d/qingy
-}
-
-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
-	ewarn "Also note that qingy doesn't seem to work realiably with"
-	ewarn "2.6.7 kernels due to problems with the DirectFB library."
-	ewarn "Your mileage may vary, but it could even lock up your machine!"
-	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=59340"
-	ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=60402"
-	ewarn "Use either a 2.6.5 or a >=2.6.8 kernel!"
-
-	if use crypt; then
-		echo
-		einfo "You will have to create a key pair using 'qingy-keygen'"
-	fi
-}
diff --git a/sys-apps/qingy/qingy-0.9.6-r2.ebuild b/sys-apps/qingy/qingy-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..2dc86f423a46
--- /dev/null
+++ b/sys-apps/qingy/qingy-0.9.6-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.9.6-r2.ebuild,v 1.1 2008/04/03 14:54:13 s4t4n Exp $
+
+inherit elisp-common eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt directfb emacs gpm logrotate opensslcrypt pam static X"
+
+RDEPEND=">=sys-libs/ncurses-5.4-r6
+	opensslcrypt? ( >=dev-libs/openssl-0.9.7e )
+	crypt?        ( >=dev-libs/libgcrypt-1.2.1 )
+	directfb?     ( >=dev-libs/DirectFB-0.9.24 )
+	emacs?        ( virtual/emacs )
+	pam?          ( >=sys-libs/pam-0.75-r11 )
+	X?            ( x11-libs/libX11
+					x11-libs/libXScrnSaver
+					x11-proto/scrnsaverproto )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=sys-apps/sed-4.1.4-r1"
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack()
+{
+	if use crypt && use opensslcrypt; then
+		echo
+		eerror "You can have openssl or libgcrypt as a crypto library, not both."
+		eerror "Please check your USE flags..."
+		echo
+		die "USE flags check failed"
+	fi
+
+	if use directfb; then
+
+		#Issues with this version have been work-arounded :-)
+		#if has_version "=dev-libs/DirectFB-0.9.25.1"; then
+		#	echo
+		#	ewarn "You are running DirectFB version 0.9.25.1:"
+		#	ewarn "I advise against that as this version introduces"
+		#	ewarn "instability, expecially when closing DirectFB mode!"
+		#	ewarn "Please consider downgrading DirectFB to version 0.9.24..."
+		#	echo
+		#	epause
+		#fi
+
+		if ! built_with_use -a dev-libs/DirectFB fbcon jpeg png truetype; then
+			echo
+			eerror "qingy expects DirectFB to provide certain capabilities."
+			eerror "It depends on the theme you use, but at least the following USE flags"
+			eerror "should be enabled in DirectFB: fbcon jpeg png truetype."
+			eerror "You must rebuild DirectFB those USE flags enabled!"
+			echo
+			die "USE flags check failed"
+		fi
+
+	fi
+
+	unpack ${A}
+
+	#Install updated PAM file. See bug #210829
+	if use pam; then
+		cp "${FILESDIR}/qingy-pamfile" "${S}/media/pam/gentoo/qingy"
+	fi
+}
+
+src_compile()
+{
+	local crypto_support="--disable-crypto"
+	local emacs_support="--disable-emacs"
+
+	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}					   \
+		|| die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+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 || die "Installation failed"
+
+	# 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 "Gentoo theme installation failed"
+
+	# Alter config file so that it uses our theme
+	sed -i 's/theme = "default"/theme = "gentoo"/' "${D}/etc/${PN}/settings"
+
+	# Install log rotation policy if user wants it
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}-logrotate" ${PN} || die "Log rotation policy installation failed"
+	fi
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+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
+}