Fix init.d script dependencies, bug#201485, thanks to David Durrleman, cleanup

(Portage version: 2.1.4_rc8, RepoMan options: --force)

12 files changed, 18 insertions, 309 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index db72a59fde96..54cb5fdb661e 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-power/hibernate-script
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.72 2007/11/25 06:08:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.73 2007/12/08 07:58:04 alonbl Exp $
+
+*hibernate-script-1.97-r4 (08 Dec 2007)
+
+  08 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -hibernate-script-1.95-r3.ebuild, -hibernate-script-1.96.ebuild,
+  -hibernate-script-1.96-r1.ebuild, -hibernate-script-1.97-r2.ebuild,
+  -hibernate-script-1.97-r3.ebuild, +hibernate-script-1.97-r4.ebuild:
+  Fix init.d script dependencies, bug#201485, thanks to David Durrleman,
+  cleanup.
 
 *hibernate-script-1.97-r3 (25 Nov 2007)
 
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3
deleted file mode 100644
index d3d8c8c81a08..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 05043b8ab3b2b2651bb7c92926295244 hibernate-script-1.95-patches-3.tar.bz2 2111
-RMD160 5a78ac9187b179f13576cef781516a3f6f6d4e51 hibernate-script-1.95-patches-3.tar.bz2 2111
-SHA256 2363769ecd92dcfce1cda7dbc025058059f4cfd1b8f75751bf2e182691879c6b hibernate-script-1.95-patches-3.tar.bz2 2111
-MD5 026a7a8992da4fe56fb19530df998806 hibernate-script-1.95.tar.gz 74954
-RMD160 032cb97c355248640107e779f99ad5a86fb74846 hibernate-script-1.95.tar.gz 74954
-SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123 hibernate-script-1.95.tar.gz 74954
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.96 b/sys-power/hibernate-script/files/digest-hibernate-script-1.96
deleted file mode 100644
index fe9d240ba275..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.96
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b52e730861e432f656651410eb79a5b hibernate-script-1.96-patches-1.tar.bz2 1225
-RMD160 976b2509c35b1de7978919075d59fd924d0584ae hibernate-script-1.96-patches-1.tar.bz2 1225
-SHA256 e2931874186396ea4b12c251952d2300cf3c96681fa486f178f2f23ba20620df hibernate-script-1.96-patches-1.tar.bz2 1225
-MD5 1ca5fc5505131c0fa08cfcc1caf39b0f hibernate-script-1.96.tar.gz 77958
-RMD160 d0542e0f5e96a27d8b40ab64a72abe74a89f0419 hibernate-script-1.96.tar.gz 77958
-SHA256 b5b155808864d0f8351d002c01805c1ec02f5573698efc49e91ad703fbe96f4b hibernate-script-1.96.tar.gz 77958
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
deleted file mode 100644
index 6cbe150b3d56..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 acb6efbcac82d00ea757f67ae3a7e993 hibernate-script-1.96-patches-2.tar.bz2 4254
-RMD160 89493fde6655201da028bacbe73e8b0c9390167f hibernate-script-1.96-patches-2.tar.bz2 4254
-SHA256 bef31573f00bd08330660b45f272409356abaab498abd34a4b48f868841d379d hibernate-script-1.96-patches-2.tar.bz2 4254
-MD5 1ca5fc5505131c0fa08cfcc1caf39b0f hibernate-script-1.96.tar.gz 77958
-RMD160 d0542e0f5e96a27d8b40ab64a72abe74a89f0419 hibernate-script-1.96.tar.gz 77958
-SHA256 b5b155808864d0f8351d002c01805c1ec02f5573698efc49e91ad703fbe96f4b hibernate-script-1.96.tar.gz 77958
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r2 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r2
deleted file mode 100644
index e7d778ec161a..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b7cce3ec7d96e01e0d25d0354b7f0fbe hibernate-script-1.97-patches-3.tar.bz2 3018
-RMD160 fb0f7ea094d8b89a08fda1ac6e1d99cb149118c3 hibernate-script-1.97-patches-3.tar.bz2 3018
-SHA256 fc3ab4b64dd0d3d568a2c6d28b5c45d9be668f06d47b4d6bcf41ec5166c5a1b4 hibernate-script-1.97-patches-3.tar.bz2 3018
-MD5 c3551238a2fe8bbe7b0e20322d8e02a5 hibernate-script-1.97.tar.gz 81504
-RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 hibernate-script-1.97.tar.gz 81504
-SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c hibernate-script-1.97.tar.gz 81504
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
deleted file mode 100644
index 6dd3bfc300e4..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a6155e1e3d145a35fa0e5c1485a7341e hibernate-script-1.97-patches-4.tar.bz2 3280
-RMD160 b1c048ef4275b5f643a0da1049315746185b1982 hibernate-script-1.97-patches-4.tar.bz2 3280
-SHA256 fd220135f7c3920fa61fecb4a240bb51fd22a5b9a606e65f3b2439ef6ab177ec hibernate-script-1.97-patches-4.tar.bz2 3280
-MD5 c3551238a2fe8bbe7b0e20322d8e02a5 hibernate-script-1.97.tar.gz 81504
-RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 hibernate-script-1.97.tar.gz 81504
-SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c hibernate-script-1.97.tar.gz 81504
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r4 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r4
new file mode 100644
index 000000000000..21dcd3ff51ad
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r4
@@ -0,0 +1,6 @@
+MD5 b5c475ccb95a1ba7b9dc10e5dac5b76e hibernate-script-1.97-patches-5.tar.bz2 3278
+RMD160 5a2c7065a1fb40b37f1a122e1044cdbfa9e4afa3 hibernate-script-1.97-patches-5.tar.bz2 3278
+SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651 hibernate-script-1.97-patches-5.tar.bz2 3278
+MD5 c3551238a2fe8bbe7b0e20322d8e02a5 hibernate-script-1.97.tar.gz 81504
+RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 hibernate-script-1.97.tar.gz 81504
+SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c hibernate-script-1.97.tar.gz 81504
diff --git a/sys-power/hibernate-script/hibernate-script-1.95-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.95-r3.ebuild
deleted file mode 100644
index 5abce8cd91d2..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.95-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 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.95-r3.ebuild,v 1.2 2007/11/12 10:44:17 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="3"
-
-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="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Our patches
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-src_install() {
-	BASE_DIR="${D}" \
-		DISTRIBUTION="gentoo" \
-		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-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins hibernate.vim
-	fi
-
-	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
-
-	insinto /etc/logrotate.d
-	newins "${S}"/logrotate.d-hibernate-script hibernate-script
-}
-
-pkg_postinst() {
-	elog
-	elog "If you run suspend2, you should run the following command to"
-	elog "invalidate suspend images on a clean boot."
-	elog
-	elog "  # rc-update add hibernate-cleanup boot"
-	elog
-	elog "See /usr/share/doc/${PF}/README.* 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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
deleted file mode 100644
index d15530c2efaa..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 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.96-r1.ebuild,v 1.2 2007/11/12 10:44:17 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="2"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.tuxonice.net/"
-SRC_URI="http://www.tuxonice.net/downloads/all/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND="!<media-gfx/splashutils-1.5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Our patches
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-src_install() {
-	BASE_DIR="${D}" \
-		DISTRIBUTION="gentoo" \
-		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-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins hibernate.vim
-	fi
-
-	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
-
-	insinto /etc/logrotate.d
-	newins "${S}"/logrotate.d-hibernate-script hibernate-script
-}
-
-pkg_postinst() {
-	elog
-	elog "If you run suspend2, you should run the following command to"
-	elog "invalidate suspend images on a clean boot."
-	elog
-	elog "  # rc-update add hibernate-cleanup boot"
-	elog
-	elog "See /usr/share/doc/${PF}/README.* 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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.96.ebuild b/sys-power/hibernate-script/hibernate-script-1.96.ebuild
deleted file mode 100644
index c70ea1b87d60..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.96.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 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.96.ebuild,v 1.2 2007/11/12 10:44:17 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="1"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.tuxonice.net/"
-SRC_URI="http://www.tuxonice.net/downloads/all/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Our patches
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-src_install() {
-	BASE_DIR="${D}" \
-		DISTRIBUTION="gentoo" \
-		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-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins hibernate.vim
-	fi
-
-	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
-
-	insinto /etc/logrotate.d
-	newins "${S}"/logrotate.d-hibernate-script hibernate-script
-}
-
-pkg_postinst() {
-	elog
-	elog "If you run suspend2, you should run the following command to"
-	elog "invalidate suspend images on a clean boot."
-	elog
-	elog "  # rc-update add hibernate-cleanup boot"
-	elog
-	elog "See /usr/share/doc/${PF}/README.* 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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild b/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild
deleted file mode 100644
index aa7ab1269322..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 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.97-r2.ebuild,v 1.1 2007/11/17 07:39:03 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="3"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.tuxonice.net/"
-SRC_URI="http://www.tuxonice.net/downloads/all/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND="!<media-gfx/splashutils-1.5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Our patches
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-src_install() {
-	BASE_DIR="${D}" \
-		DISTRIBUTION="gentoo" \
-		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-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins hibernate.vim
-	fi
-
-	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
-
-	insinto /etc/logrotate.d
-	newins "${S}"/logrotate.d-hibernate-script hibernate-script
-}
-
-pkg_postinst() {
-	elog
-	elog "You should run the following command to invalidate suspend"
-	elog "images on a clean boot."
-	elog
-	elog "  # rc-update add hibernate-cleanup boot"
-	elog
-	elog "See /usr/share/doc/${PF}/README.* 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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild
index 207de08855a4..956a01b8544c 100644
--- a/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 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.97-r3.ebuild,v 1.1 2007/11/25 06:08:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild,v 1.1 2007/12/08 07:58:04 alonbl Exp $
 
 inherit eutils
 
-PATCH_VERSION="4"
+PATCH_VERSION="5"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
 HOMEPAGE="http://www.tuxonice.net/"