New revision with updated emacs support and some QA, closing bug 184318. Wiped out previous unstable releases.

(Portage version: 2.1.2.9)

6 files changed, 37 insertions, 152 deletions

diff --git a/sys-apps/qingy/ChangeLog b/sys-apps/qingy/ChangeLog
index a2d2a7e52f1b..b37ebf68c87f 100644
--- a/sys-apps/qingy/ChangeLog
+++ b/sys-apps/qingy/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sys-apps/qingy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.42 2007/04/26 05:23:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.43 2007/07/20 08:26:43 s4t4n Exp $
 
+*qingy-0.9.6-r1 (20 Jul 2007)
+
+  20 Jul 2007; Michele Noberasco <s4t4n@gentoo.org> qingy-0.9.6-r1.ebuild:
+  Revision bump, with updated emacs support as well as some QA.
+  Closes bug #184318.
+  qingy-0.9.4.ebuild, qingy 0.9.6:
+  Wiped out previous versions.
+  
 *qingy-0.9.6 (26 Apr 2007)
 
   26 Apr 2007; Michele Noberasco <s4t4n@gentoo.org> qingy-0.9.6.ebuild:
diff --git a/sys-apps/qingy/files/50qingy-gentoo.el b/sys-apps/qingy/files/50qingy-gentoo.el
new file mode 100644
index 000000000000..b59c36ed8038
--- /dev/null
+++ b/sys-apps/qingy/files/50qingy-gentoo.el
@@ -0,0 +1,6 @@
+
+;; qingy site initialisation file
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'qingy "qingy-mode" "Major mode for editing Qingy settings and themes" t)
+(add-to-list 'auto-mode-alist '("/\\(?:settings\\|theme\\)$" . qingy-mode))
diff --git a/sys-apps/qingy/files/digest-qingy-0.9.4 b/sys-apps/qingy/files/digest-qingy-0.9.4
deleted file mode 100644
index 9991a3163801..000000000000
--- a/sys-apps/qingy/files/digest-qingy-0.9.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0576a0857a6d95f76b5ea8d50394bb08 qingy-0.9.4.tar.bz2 623962
-RMD160 5100c3017ed81e393d9f1ae4288fa576c5713cf8 qingy-0.9.4.tar.bz2 623962
-SHA256 b1e42fffa770562dfe65dbc9a5a30dde2083c6a012cb0fb756d94a50acf140a3 qingy-0.9.4.tar.bz2 623962
-MD5 af5f4dbf0da9a7b75365017835f6718e qingy-gentoo-theme-2.0.tar.bz2 150712
-RMD160 372add7e4cb5eba54cf3f5c2b1ae6181f0535202 qingy-gentoo-theme-2.0.tar.bz2 150712
-SHA256 e1c1ade006c58a0fb90ac2027179cb8bb7f4c74ae571542b530f90367517b64f qingy-gentoo-theme-2.0.tar.bz2 150712
diff --git a/sys-apps/qingy/files/digest-qingy-0.9.6 b/sys-apps/qingy/files/digest-qingy-0.9.6-r1
index a201bfdf0860..a201bfdf0860 100644
--- a/sys-apps/qingy/files/digest-qingy-0.9.6
+++ b/sys-apps/qingy/files/digest-qingy-0.9.6-r1
diff --git a/sys-apps/qingy/qingy-0.9.4.ebuild b/sys-apps/qingy/qingy-0.9.4.ebuild
deleted file mode 100644
index de113d3d8d49..000000000000
--- a/sys-apps/qingy/qingy-0.9.4.ebuild
+++ /dev/null
@@ -1,132 +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.9.4.ebuild,v 1.2 2007/01/08 09:43:40 s4t4n Exp $
-
-inherit eutils
-
-GENTOO_THEME_VERSION="2.0"
-
-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="x86 ~ppc ~amd64"
-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 )
-	                       virtual/x11 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=sys-apps/sed-4.1.4-r1"
-
-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}
-}
-
-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`              \
-		`use_enable X x-support`               \
-		`use_enable directfb DirectFB-support` \
-		${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
-
-	# 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
-
-	# 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
-}
-
-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."
-
-	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.ebuild b/sys-apps/qingy/qingy-0.9.6-r1.ebuild
index 5117e9a0fa6d..a6240439ad46 100644
--- a/sys-apps/qingy/qingy-0.9.6.ebuild
+++ b/sys-apps/qingy/qingy-0.9.6-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.9.6.ebuild,v 1.1 2007/04/26 05:23:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.9.6-r1.ebuild,v 1.1 2007/07/20 08:26:43 s4t4n Exp $
 
-inherit eutils
+inherit elisp-common eutils
 
 GENTOO_THEME_VERSION="2.1"
 
@@ -22,15 +22,14 @@ RDEPEND=">=sys-libs/ncurses-5.4-r6
 	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 )
-	                       virtual/x11 ) )"
+	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()
 {
@@ -73,20 +72,22 @@ src_unpack()
 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 emacs`                     \
 		`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"
 }
@@ -98,25 +99,27 @@ src_install()
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
 
 	# Install the program
-	make DESTDIR=${D} install || die "Installation failed"
+	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
+	/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 \
+	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
+	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"
+		newins "${FILESDIR}/${PN}-logrotate" ${PN} || die "Log rotation policy installation failed"
 	fi
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }
 
 pkg_postinst()
@@ -137,4 +140,10 @@ pkg_postinst()
 		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
 }