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

Package-Manager: portage-2.1.2.9

7 files changed, 52 insertions, 172 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/Manifest b/sys-apps/qingy/Manifest
index 461aca10cbf9..4a4585c3ea65 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -1,28 +1,26 @@
+AUX 50qingy-gentoo.el 234 RMD160 f3b6d177b4575ad745be482f1c616d4dca18cb19 SHA1 61c874ce5660c98fd5532bddab75ff546ed32b58 SHA256 f95633e23607471da085fcc888d73ab2c76e838a1426b0698a0a0041651dbd1c
+MD5 f2b0c2bc4be7e54f17160248475f777f files/50qingy-gentoo.el 234
+RMD160 f3b6d177b4575ad745be482f1c616d4dca18cb19 files/50qingy-gentoo.el 234
+SHA256 f95633e23607471da085fcc888d73ab2c76e838a1426b0698a0a0041651dbd1c files/50qingy-gentoo.el 234
 AUX qingy-logrotate 75 RMD160 4a07170b5898315881dd19a5513336a766207def SHA1 113d03c9db791afa5f928cbb5bf751b31bffcaac SHA256 bf30d9b8a6cf3bf15ff22cd29134e06174fee0ce2aaef4ee383d3c14fe859e44
 MD5 a7a82e1d2d5b64f97781cf3696a0459b files/qingy-logrotate 75
 RMD160 4a07170b5898315881dd19a5513336a766207def files/qingy-logrotate 75
 SHA256 bf30d9b8a6cf3bf15ff22cd29134e06174fee0ce2aaef4ee383d3c14fe859e44 files/qingy-logrotate 75
 DIST qingy-0.7.4.tar.bz2 594870 RMD160 619fd885ac4ab8daec1cf969dae59e59a34bed17 SHA1 8dc47f377749cdb929463f97c5a4184c304b5f53 SHA256 8d2886e054470a9a22618dbe9592b4c029f20cdc142f4d0c54af044bb3cdef4f
-DIST qingy-0.9.4.tar.bz2 623962 RMD160 5100c3017ed81e393d9f1ae4288fa576c5713cf8 SHA1 e80a2024eb9bf6a4138c2a033018a7793114ab4a SHA256 b1e42fffa770562dfe65dbc9a5a30dde2083c6a012cb0fb756d94a50acf140a3
 DIST qingy-0.9.6.tar.bz2 596883 RMD160 558cca749a33ecc0859a5fcd2aed14eba8600eb8 SHA1 fa00ea1a6188defd2bc77dbab662800b03436c29 SHA256 496f67e043e675f9f7d92a42eb17e1038bb14d93975ff2c09887ddbd3e891822
-DIST qingy-gentoo-theme-2.0.tar.bz2 150712 RMD160 372add7e4cb5eba54cf3f5c2b1ae6181f0535202 SHA1 fb467d686148e3aa6d894086f3f506b920ff2203 SHA256 e1c1ade006c58a0fb90ac2027179cb8bb7f4c74ae571542b530f90367517b64f
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 RMD160 24a6792753dbed00bfadcab47e7b048c2f7797b4 SHA1 f94c315ed0a3a52ca9d69afcbd648fba0a06e227 SHA256 1b770255577ed3fc89e1cfdf5019990bf4deffab26201e095084dd5bd97bf093
 EBUILD qingy-0.7.4.ebuild 2846 RMD160 98e0502c2939c71f4978e3a402eb8fe9f170eb87 SHA1 b7490d07194238947c24db364cdb7d7cf1197431 SHA256 a0f278d1a92a90422fb2439fddc536c92b6290f5197835a93b61506235df2514
 MD5 4630d19fe522e016ee220e64ab627312 qingy-0.7.4.ebuild 2846
 RMD160 98e0502c2939c71f4978e3a402eb8fe9f170eb87 qingy-0.7.4.ebuild 2846
 SHA256 a0f278d1a92a90422fb2439fddc536c92b6290f5197835a93b61506235df2514 qingy-0.7.4.ebuild 2846
-EBUILD qingy-0.9.4.ebuild 4075 RMD160 c7b1e0bc1dd52203e10bd4fbd22789228142a552 SHA1 9141a96af3e27b84a5e52ced2beb0516d539242f SHA256 ad7e11d46680f35e05dd35619451a11e22982abd443620e4ceb44d829e9899b8
-MD5 fb24dd2921524b2e87b50214d469aef6 qingy-0.9.4.ebuild 4075
-RMD160 c7b1e0bc1dd52203e10bd4fbd22789228142a552 qingy-0.9.4.ebuild 4075
-SHA256 ad7e11d46680f35e05dd35619451a11e22982abd443620e4ceb44d829e9899b8 qingy-0.9.4.ebuild 4075
-EBUILD qingy-0.9.6.ebuild 4518 RMD160 d5aed35e1ac645be234910e422e60783d716b5c9 SHA1 78e936f9765fd40af8fea3710004e03ec7ee6fe1 SHA256 de858b15bcca0d72fb4c38c906301be952214d7b05ad4abd85cbe1c6dfe0b48d
-MD5 19b615d33fb36fb30c0427cef0d152b8 qingy-0.9.6.ebuild 4518
-RMD160 d5aed35e1ac645be234910e422e60783d716b5c9 qingy-0.9.6.ebuild 4518
-SHA256 de858b15bcca0d72fb4c38c906301be952214d7b05ad4abd85cbe1c6dfe0b48d qingy-0.9.6.ebuild 4518
-MISC ChangeLog 7279 RMD160 93288287bd2679fac33a58e148f0ddbc73daa1f9 SHA1 8b69a2e979a1c2dc5518035469af2796bbf4cd87 SHA256 6dfc2af677d88da761b2b11d868dabf0460e26697acd13caf016304d99dacb16
-MD5 c01e6bfaaff73e2704a886924f342df6 ChangeLog 7279
-RMD160 93288287bd2679fac33a58e148f0ddbc73daa1f9 ChangeLog 7279
-SHA256 6dfc2af677d88da761b2b11d868dabf0460e26697acd13caf016304d99dacb16 ChangeLog 7279
+EBUILD qingy-0.9.6-r1.ebuild 4724 RMD160 85da6e01c148f7f8da881d2bae7ebb714f066680 SHA1 ab9ab60d1f08b97a2a9d61f7cdc55c1d900365d5 SHA256 b002973c959e83a76465e30133d9e56424de3db13db371549cb174a642e4cb22
+MD5 95217c37f477b15068a3d79201d1e42f qingy-0.9.6-r1.ebuild 4724
+RMD160 85da6e01c148f7f8da881d2bae7ebb714f066680 qingy-0.9.6-r1.ebuild 4724
+SHA256 b002973c959e83a76465e30133d9e56424de3db13db371549cb174a642e4cb22 qingy-0.9.6-r1.ebuild 4724
+MISC ChangeLog 7540 RMD160 d1ffd32fc8b248911f80598c7aa84a29e95a756e SHA1 d7665679ca347648333d53675ec32372cd4132f7 SHA256 4feb98f7e74190ad18bf315e7ce5d1e53d9ff5c489218dfe8326c9e4f2024b6d
+MD5 d00fdfbe14038cad15ce3ff657e8abab ChangeLog 7540
+RMD160 d1ffd32fc8b248911f80598c7aa84a29e95a756e ChangeLog 7540
+SHA256 4feb98f7e74190ad18bf315e7ce5d1e53d9ff5c489218dfe8326c9e4f2024b6d ChangeLog 7540
 MISC metadata.xml 258 RMD160 72ac06ea988b5c02ee83d8208227393f96163029 SHA1 bd7286c13ad729460f1ea593c837aa3ce264c30d SHA256 a6e0ab513611a91cf536305afc90471fc24662b427f58089f009209b545ff4fb
 MD5 40051d4be23df0dc23c2dadbaa168415 metadata.xml 258
 RMD160 72ac06ea988b5c02ee83d8208227393f96163029 metadata.xml 258
@@ -30,9 +28,6 @@ SHA256 a6e0ab513611a91cf536305afc90471fc24662b427f58089f009209b545ff4fb metadata
 MD5 0db885344e5f008090da21661c5ac50d files/digest-qingy-0.7.4 238
 RMD160 1b18e8dad93e114c09b67312bc75283a106c2925 files/digest-qingy-0.7.4 238
 SHA256 91aebec88b563bbdf5c543f3fee0e94166c88c4d6c1449d5edce8b0fd3b0e1ab files/digest-qingy-0.7.4 238
-MD5 c6b4f1597d1a49c093db856c636e526a files/digest-qingy-0.9.4 509
-RMD160 b1ef3a8facbf464b5b85015630e03085ba213248 files/digest-qingy-0.9.4 509
-SHA256 c3a96b38733f4d0d1bdb7b8fc63ac5b81db7575f0d86c9df6586b12c7fcd913e files/digest-qingy-0.9.4 509
-MD5 48bcf9b4f1b253aa90756a5c4d525663 files/digest-qingy-0.9.6 509
-RMD160 7e7213a6ca265d2731343d9d762c018da1d537f2 files/digest-qingy-0.9.6 509
-SHA256 26dc88966e3a6321be61494b68a583fec04bffb464bf61136187965909d711a5 files/digest-qingy-0.9.6 509
+MD5 48bcf9b4f1b253aa90756a5c4d525663 files/digest-qingy-0.9.6-r1 509
+RMD160 7e7213a6ca265d2731343d9d762c018da1d537f2 files/digest-qingy-0.9.6-r1 509
+SHA256 26dc88966e3a6321be61494b68a583fec04bffb464bf61136187965909d711a5 files/digest-qingy-0.9.6-r1 509
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
 }