From 98e76098c119c51fb97e53438063cdb01d8ebef6 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Thu, 21 Dec 2006 21:03:17 +0000 Subject: [PATCH] Added missing files, closes bug#158504, thanks to Lars Weiler. Some cleanups. Package-Manager: portage-2.1.1-r2 --- sys-power/hibernate-script/Manifest | 40 +++------- .../files/digest-hibernate-script-1.12-r1 | 3 - .../files/digest-hibernate-script-1.94 | 6 -- .../files/hibernate-script-1.12-gentoo.patch | 29 ------- .../files/hibernate-script-1.12-misc.patch | 20 ----- .../hibernate-script-1.12-r1.ebuild | 78 ------------------- .../hibernate-script-1.94.ebuild | 73 ----------------- 7 files changed, 12 insertions(+), 237 deletions(-) delete mode 100644 sys-power/hibernate-script/files/digest-hibernate-script-1.12-r1 delete mode 100644 sys-power/hibernate-script/files/digest-hibernate-script-1.94 delete mode 100644 sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch delete mode 100644 sys-power/hibernate-script/files/hibernate-script-1.12-misc.patch delete mode 100644 sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild delete mode 100644 sys-power/hibernate-script/hibernate-script-1.94.ebuild diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest index 26062805b070..8b926bb0d5be 100644 --- a/sys-power/hibernate-script/Manifest +++ b/sys-power/hibernate-script/Manifest @@ -1,42 +1,26 @@ -AUX hibernate-script-1.12-gentoo.patch 834 RMD160 3eef1a8651344191491b2687d472a860d4af5bbd SHA1 128ddf545adb0c93d3169406a0cebf8d0f67f55f SHA256 e54d9ea0a6664dbe51cb44c1802f63472e3d3b493e0b5c2730366922a02d5aee -MD5 4771f1307f9d9d0d08fdfa6b4de5af48 files/hibernate-script-1.12-gentoo.patch 834 -RMD160 3eef1a8651344191491b2687d472a860d4af5bbd files/hibernate-script-1.12-gentoo.patch 834 -SHA256 e54d9ea0a6664dbe51cb44c1802f63472e3d3b493e0b5c2730366922a02d5aee files/hibernate-script-1.12-gentoo.patch 834 -AUX hibernate-script-1.12-misc.patch 522 RMD160 adcbb3512be0c9a77474ac8569a8d917ee0336f0 SHA1 000b027dbf42fd59c4f28bac30569fac0ed74154 SHA256 37dc4bd19419c213ed69b541634cf9d4d3a74ba4ac073819a3a2771e2ca8913a -MD5 296333753a66d9b42c6a1f25b2c432f3 files/hibernate-script-1.12-misc.patch 522 -RMD160 adcbb3512be0c9a77474ac8569a8d917ee0336f0 files/hibernate-script-1.12-misc.patch 522 -SHA256 37dc4bd19419c213ed69b541634cf9d4d3a74ba4ac073819a3a2771e2ca8913a files/hibernate-script-1.12-misc.patch 522 -DIST hibernate-script-1.12.tar.gz 64752 RMD160 3c2811d633727afd63f12062730515c9f6b16c4c SHA1 ba572234e0189dd9a64e26f5bacd14610551aa45 SHA256 dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147 DIST hibernate-script-1.93-patches-0.7.tar.bz2 3069 RMD160 59c2cb44a88be47deaeaed4e6170c0f63b7d2464 SHA1 fd244eb9dada38c46fdf03326f43b2342591337e SHA256 e772a051785ac2b82ff736914169c35569e97e14845d581f446638327760fae6 DIST hibernate-script-1.93.tar.gz 68644 RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 SHA1 cea3ece2fdbe277c3e1878fd2acb9a728138c5f6 SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366 -DIST hibernate-script-1.94-patches-1.tar.bz2 3201 RMD160 e98dfe551c0593ba587b10e1f7278acf4218a748 SHA1 d6671ff9003bb69a44342590e93739371297648d SHA256 460b2fc2638f302999552fbe2d5a4e78aea3b127f58454e961013caf3f99a035 +DIST hibernate-script-1.94-patches-2.tar.bz2 3225 RMD160 c12154ac46444c521a6fd902cc9d80d455ee1641 SHA1 48ccbc371331dc1d9bf4b7ac670bef0fbdde7e85 SHA256 a784331f7438d93b9895630086c02fda90fea00b30d8bc2dafec3b5080c5bd28 DIST hibernate-script-1.94.tar.gz 72928 RMD160 31d105c08bf183e3bc770543e0ae01678798859b SHA1 ebd6647c5859be9bffe0466f85eeaaeac81101be SHA256 57ad0de0cce263c76303a5c7116550f19aaec540c6743e0b5bcd5d0cb68d2fe2 -EBUILD hibernate-script-1.12-r1.ebuild 1974 RMD160 ccc26a0d4ab187628a79b8c4312038615e74573d SHA1 e277b36a60dc3f66802bccc8a47151f0c1ab8e3b SHA256 9d3fa9cd0ca38f4ab75056d4dc470176c9f9bd2cf00045be58f77083655b789d -MD5 53831bcba1472acf2c180f2e6e754a63 hibernate-script-1.12-r1.ebuild 1974 -RMD160 ccc26a0d4ab187628a79b8c4312038615e74573d hibernate-script-1.12-r1.ebuild 1974 -SHA256 9d3fa9cd0ca38f4ab75056d4dc470176c9f9bd2cf00045be58f77083655b789d hibernate-script-1.12-r1.ebuild 1974 EBUILD hibernate-script-1.93-r6.ebuild 2046 RMD160 7ce144614e5e5acd01c88fe13f2c1baf0ac9ad24 SHA1 621608f7d6828cec8d3b893cafd95e57bf4cbd1e SHA256 c5efa3cf5f5e199f2228bc9b4260865d3d4d8072d814a32d0c489c64fa863e36 MD5 a38d65b6c6c0efb008796f46588efc49 hibernate-script-1.93-r6.ebuild 2046 RMD160 7ce144614e5e5acd01c88fe13f2c1baf0ac9ad24 hibernate-script-1.93-r6.ebuild 2046 SHA256 c5efa3cf5f5e199f2228bc9b4260865d3d4d8072d814a32d0c489c64fa863e36 hibernate-script-1.93-r6.ebuild 2046 -EBUILD hibernate-script-1.94.ebuild 2045 RMD160 222782ea1816ec586bbb63217fb59aabebdc44e8 SHA1 0b7afb78bbadb7e7743950f7848f18d70d8a3ce7 SHA256 e16e039a8ff8924a6ddf020db307a5b5d360991d4e3772e8eeb9112f1b231558 -MD5 632bb292082d5c42817d950fa3f6d629 hibernate-script-1.94.ebuild 2045 -RMD160 222782ea1816ec586bbb63217fb59aabebdc44e8 hibernate-script-1.94.ebuild 2045 -SHA256 e16e039a8ff8924a6ddf020db307a5b5d360991d4e3772e8eeb9112f1b231558 hibernate-script-1.94.ebuild 2045 -MISC ChangeLog 10296 RMD160 0ce5d43b0a6a86a00b717d3918196bed3b8ddad4 SHA1 2258a1a7a9c2c021b0463053fe3f108964be6774 SHA256 130d4810045cd17b56fb5a1a6cf413b3f7c1fe96aa6d55e8a18245c029f21bcb -MD5 3a2e3570c9ff24a9a5fbbe5d842f4224 ChangeLog 10296 -RMD160 0ce5d43b0a6a86a00b717d3918196bed3b8ddad4 ChangeLog 10296 -SHA256 130d4810045cd17b56fb5a1a6cf413b3f7c1fe96aa6d55e8a18245c029f21bcb ChangeLog 10296 +EBUILD hibernate-script-1.94-r1.ebuild 2048 RMD160 c452cff4df3ba8895cfb3a839ef9832590756176 SHA1 ad9e72de6cbc13f745e3c27dacdd7b8f68ff40fb SHA256 c25b445a3f624b4f9c1d9e6c61f94021d729f9d9c5a4e961c3bdd96b8ee5c59f +MD5 9b4cfa6a4cbd4d042ac0fb119c9e4449 hibernate-script-1.94-r1.ebuild 2048 +RMD160 c452cff4df3ba8895cfb3a839ef9832590756176 hibernate-script-1.94-r1.ebuild 2048 +SHA256 c25b445a3f624b4f9c1d9e6c61f94021d729f9d9c5a4e961c3bdd96b8ee5c59f hibernate-script-1.94-r1.ebuild 2048 +MISC ChangeLog 10657 RMD160 af0b658cae649b275c2ecc53c2d7692e2607823e SHA1 41073c0a349e6e96bf108b1b370fd7a213dbfa45 SHA256 1e32f1dd155cad8cffbae52d5ef94fbc96393fcf2cfd352aabee4d666c75a2e6 +MD5 d006f9d012aa8c087e8a4c466e104f33 ChangeLog 10657 +RMD160 af0b658cae649b275c2ecc53c2d7692e2607823e ChangeLog 10657 +SHA256 1e32f1dd155cad8cffbae52d5ef94fbc96393fcf2cfd352aabee4d666c75a2e6 ChangeLog 10657 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252 SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31 metadata.xml 252 -MD5 0c2af54d8ff3276d4ad0f267a4e034ca files/digest-hibernate-script-1.12-r1 262 -RMD160 021b4883dc2d937fd49b8baf01418704172ae599 files/digest-hibernate-script-1.12-r1 262 -SHA256 245468f631843dc85438ff9e62e91fbee4a39ce575f577bf8b536de5078a39b9 files/digest-hibernate-script-1.12-r1 262 MD5 0a42973d8e71dbef4d2ad90de7a82867 files/digest-hibernate-script-1.93-r6 560 RMD160 051b71990889408590851ea0e365cf471df3bbda files/digest-hibernate-script-1.93-r6 560 SHA256 88b531327e6071d8c2234f3ed49023068494d0ddbc3817eda6d23160b1bfdb6b files/digest-hibernate-script-1.93-r6 560 -MD5 0092ffe75a98f504b4d2f95699c7ae4a files/digest-hibernate-script-1.94 554 -RMD160 da75f0b5c9fa622e38b729d1597fc7ffbef87522 files/digest-hibernate-script-1.94 554 -SHA256 1f7a94cb929baa400cedadb78f03a41e5f0d05f89907eaf150813a1d7d5e50ef files/digest-hibernate-script-1.94 554 +MD5 58e8ae7fb8326ee43c3e276c17d4c60e files/digest-hibernate-script-1.94-r1 554 +RMD160 bcac2ff6fe272289fe7365e9d7563bf29fcd520e files/digest-hibernate-script-1.94-r1 554 +SHA256 90b7c1db89d55121e20afe968f306fb76545aea68cb36bbaf6f126f883c98f24 files/digest-hibernate-script-1.94-r1 554 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 deleted file mode 100644 index bdef49359228..000000000000 --- a/sys-power/hibernate-script/files/digest-hibernate-script-1.12-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0fb7c524a30daacf200f27de2e398646 hibernate-script-1.12.tar.gz 64752 -RMD160 3c2811d633727afd63f12062730515c9f6b16c4c hibernate-script-1.12.tar.gz 64752 -SHA256 dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147 hibernate-script-1.12.tar.gz 64752 diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.94 b/sys-power/hibernate-script/files/digest-hibernate-script-1.94 deleted file mode 100644 index 6ea11f058165..000000000000 --- a/sys-power/hibernate-script/files/digest-hibernate-script-1.94 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 cb7213bc3980e896dd03e0ba7f3575e5 hibernate-script-1.94-patches-1.tar.bz2 3201 -RMD160 e98dfe551c0593ba587b10e1f7278acf4218a748 hibernate-script-1.94-patches-1.tar.bz2 3201 -SHA256 460b2fc2638f302999552fbe2d5a4e78aea3b127f58454e961013caf3f99a035 hibernate-script-1.94-patches-1.tar.bz2 3201 -MD5 f8826d4c96e320902382f29c91694c04 hibernate-script-1.94.tar.gz 72928 -RMD160 31d105c08bf183e3bc770543e0ae01678798859b hibernate-script-1.94.tar.gz 72928 -SHA256 57ad0de0cce263c76303a5c7116550f19aaec540c6743e0b5bcd5d0cb68d2fe2 hibernate-script-1.94.tar.gz 72928 diff --git a/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch deleted file mode 100644 index 2816289dac1b..000000000000 --- a/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urp hibernate-script-1.12/init.d/hibernate-cleanup.sh hibernate-script-1.12-gentoo/init.d/hibernate-cleanup.sh ---- hibernate-script-1.12/init.d/hibernate-cleanup.sh 2005-10-02 07:54:23.000000000 +0200 -+++ hibernate-script-1.12-gentoo/init.d/hibernate-cleanup.sh 2005-10-20 15:31:33.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/sbin/runscript - - # This script invalidates any stale swsusp and Software Suspend 2 images. It - # searches all swap partitions on your machine, as well as Suspend2's -@@ -66,9 +66,14 @@ check_filewriter_sig() { - esac - } - --echo -n "Clearing Software Suspend 2 signatures... " --check_swap_sig --check_filewriter_sig --echo "done." -+depend() { -+ after localmount -+ before bootmisc -+} - --exit 0 -+start() { -+ ebegin "Clearing Software Suspend signatures" -+ check_swap_sig -+ check_filewriter_sig -+ eend -+} 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 deleted file mode 100644 index b44408e080b8..000000000000 --- a/sys-power/hibernate-script/files/hibernate-script-1.12-misc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index edb3601df37d..000000000000 --- a/sys-power/hibernate-script/hibernate-script-1.12-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.2 2006/04/30 17:49:34 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 -} diff --git a/sys-power/hibernate-script/hibernate-script-1.94.ebuild b/sys-power/hibernate-script/hibernate-script-1.94.ebuild deleted file mode 100644 index 3044328567a4..000000000000 --- a/sys-power/hibernate-script/hibernate-script-1.94.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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.94.ebuild,v 1.1 2006/12/17 21:24:10 alonbl Exp $ - -inherit eutils - -PATCH_VERSION="1" - -DESCRIPTION="Hibernate script supporting multiple suspend methods" -HOMEPAGE="http://www.suspend2.net/" -SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz - mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="logrotate vim" - -DEPEND="sys-apps/sed" -RDEPEND="logrotate? ( app-admin/logrotate )" - -src_unpack() { - unpack ${A} - cd "${S}" - - rm -f "${S}"/scriptlets.d/swsusp2_15 - epatch "${WORKDIR}"/patches/*.patch -} - -src_install() { - BASE_DIR="${D}" PREFIX=/usr MAN_DIR="${D}"/usr/share/man \ - "${S}"/install.sh || die "Install failed" - - # 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/ - - if use vim; then - insinto /usr/share/vim/vimfiles - doins hibernate.vim - fi - - dodoc CHANGELOG README SCRIPTLET-API hibernate.vim - - if use logrotate; then - insinto /etc/logrotate.d - newins "${S}"/logrotate.d-hibernate-script hibernate-script - fi -} - -pkg_postinst() { - elog - elog "You should run the following command to invalidate" - elog "suspend images on a clean boot." - elog - elog " # rc-update add hibernate-cleanup boot" - elog - elog "See /usr/share/doc/${PF}/README.gz for further details." - elog - elog "Please note that you will need to manually emerge any utilities" - elog "(radeontool, vbetool, ...) enabled in the configuration files," - elog "should you wish to use them." - elog - elog "Starting with hibernate-script-1.90 the configuration files have" - elog "been reordered and split into method specific files. Make sure you" - elog "update your /etc/hibernate/ configuration files accordingly." - elog -} -- 2.26.2