From: Henrik Brix Andersen Date: Tue, 28 Mar 2006 20:26:13 +0000 (+0000) Subject: Added patch from upstream, thanks to Alon Bar-Lev. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4149c8f89a1aab35184f623c43ed47487fb6aec8;p=gentoo.git Added patch from upstream, thanks to Alon Bar-Lev. Package-Manager: portage-2.0.54 --- diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog index 9537d81fac09..14b37af6698e 100644 --- a/sys-power/hibernate-script/ChangeLog +++ b/sys-power/hibernate-script/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-power/hibernate-script -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.20 2005/12/14 18:45:32 brix Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.21 2006/03/28 20:26:13 brix Exp $ + +*hibernate-script-1.12-r1 (28 Mar 2006) + + 28 Mar 2006; Henrik Brix Andersen + +files/hibernate-script-1.12-misc.patch, +hibernate-script-1.12-r1.ebuild: + Added patch from upstream, thanks to Alon Bar-Lev. 14 Dec 2005; Henrik Brix Andersen -files/hibernate-script-1.10-gentoo.patch, diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest index 0e5d22e6f64e..fdd63a5715b7 100644 --- a/sys-power/hibernate-script/Manifest +++ b/sys-power/hibernate-script/Manifest @@ -1,5 +1,8 @@ +MD5 4f8ae695bebcd9b33daf2a7cd2281135 ChangeLog 5215 +MD5 2875fd3dd88aa57c273a8227244675ef files/digest-hibernate-script-1.12 72 +MD5 2875fd3dd88aa57c273a8227244675ef files/digest-hibernate-script-1.12-r1 72 +MD5 4771f1307f9d9d0d08fdfa6b4de5af48 files/hibernate-script-1.12-gentoo.patch 834 +MD5 296333753a66d9b42c6a1f25b2c432f3 files/hibernate-script-1.12-misc.patch 522 +MD5 3f75f73f055d928a2b95e5da6078dd2b hibernate-script-1.12-r1.ebuild 1975 MD5 b0f5caea38f3cfec54f14ddb56dd7447 hibernate-script-1.12.ebuild 1935 -MD5 8e4ac3446605ff6fb96c7462d08ce481 ChangeLog 4989 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255 -MD5 4771f1307f9d9d0d08fdfa6b4de5af48 files/hibernate-script-1.12-gentoo.patch 834 -MD5 2875fd3dd88aa57c273a8227244675ef files/digest-hibernate-script-1.12 72 diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.12-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.12-r1 new file mode 100644 index 000000000000..4864c360ff78 --- /dev/null +++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.12-r1 @@ -0,0 +1 @@ +MD5 0fb7c524a30daacf200f27de2e398646 hibernate-script-1.12.tar.gz 64752 diff --git a/sys-power/hibernate-script/files/hibernate-script-1.12-misc.patch b/sys-power/hibernate-script/files/hibernate-script-1.12-misc.patch new file mode 100644 index 000000000000..b44408e080b8 --- /dev/null +++ b/sys-power/hibernate-script/files/hibernate-script-1.12-misc.patch @@ -0,0 +1,20 @@ +--- hibernate-script-1.12/scriptlets.d/misclaunch 2005-11-26 02:39:05.000000000 +0200 ++++ hibernate-script-1.12.new/scriptlets.d/misclaunch 2005-11-26 02:39:20.000000000 +0200 +@@ -19,7 +19,7 @@ MiscLaunchAuxFunc${MISC_LAUNCH_COUNT}() + Executing $@... + EOT2 + $@ +- [ $? -ne 0 ] && return 1 ++ [ \$? -ne 0 ] && return 1 + return 0 + } + EOT +@@ -39,7 +39,7 @@ MiscLaunchAuxFunc${MISC_LAUNCH_COUNT}() + Executing $@... + EOT2 + $@ +- [ $? -ne 0 ] && return 1 ++ [ \$? -ne 0 ] && return 1 + return 0 + } + EOT diff --git a/sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild new file mode 100644 index 000000000000..c0fab66c4bcf --- /dev/null +++ b/sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild,v 1.1 2006/03/28 20:26:13 brix Exp $ + +inherit eutils + +# The following works with both pre-releases and releases +MY_P=${PN}-${PV/_/-} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="Hibernate script supporting multiple suspend methods" + +HOMEPAGE="http://www.suspend2.net" +SRC_URI="http://www.suspend2.net/downloads/all/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="logrotate" + +DEPEND="sys-apps/sed" +RDEPEND="logrotate? ( app-admin/logrotate )" + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch + epatch ${FILESDIR}/${P}-misc.patch + + # remove obsolete swsusp2_15 scriptlet + rm -f ${S}/scriptlets.d/swsusp2_15 + + sed -i \ + -e "s:^# \(Distribution\).*:\1 gentoo:" \ + -e "s:/usr/local::" \ + ${S}/hibernate.conf + + sed -i \ + -e "s:^# \(Distribution\).*:\1 gentoo:" \ + ${S}/ram.conf +} + +src_install() { + BASE_DIR=${D} PREFIX=/usr MAN_DIR=${D}/usr/share/man \ + ${S}/install.sh + + # hibernate-ram will default to using ram.conf + dosym /usr/sbin/hibernate /usr/sbin/hibernate-ram + + newinitd ${S}/init.d/hibernate-cleanup.sh hibernate-cleanup + + # other ebuilds can install scriplets to this dir + keepdir /etc/hibernate/scriptlets.d/ + + dodoc CHANGELOG README SCRIPTLET-API + + if use logrotate; then + insinto /etc/logrotate.d + newins logrotate.d-hibernate-script hibernate-script + fi +} + +pkg_postinst() { + einfo + einfo "You should run the following command to invalidate" + einfo "suspend images on a clean boot." + einfo + einfo " # rc-update add hibernate-cleanup boot" + einfo + einfo "See /usr/share/doc/${PF}/README.gz for further details." + einfo + einfo "Please note that you will need to manually emerge any utilities" + einfo "(radeontool, vbetool, ...) enabled in the configuration files," + einfo "should you wish to use them." + einfo +}