summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2013-01-12 17:38:01 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2013-01-12 17:38:01 +0000
commit522d3b35deecaf00dc8d0830916c77d3306e325c (patch)
tree31a7c4c07a1d17583e6147f4b37b3a049af67eb2 /sys-power/hibernate-script
parentChange license, according to COPYING file in tarball (diff)
downloadgentoo-2-522d3b35deecaf00dc8d0830916c77d3306e325c.tar.gz
gentoo-2-522d3b35deecaf00dc8d0830916c77d3306e325c.tar.bz2
gentoo-2-522d3b35deecaf00dc8d0830916c77d3306e325c.zip
Fix bug#268820, bug#268133, cleanup old ebuilds
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-power/hibernate-script')
-rw-r--r--sys-power/hibernate-script/ChangeLog11
-rw-r--r--sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch29
-rw-r--r--sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild (renamed from sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild)7
3 files changed, 12 insertions, 35 deletions
diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 3ee065f9cb0d..e6915ed66b87 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-power/hibernate-script
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.94 2012/12/18 16:13:03 alonbl Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.95 2013/01/12 17:38:01 alonbl Exp $
+
+*hibernate-script-2.0-r6 (12 Jan 2013)
+
+ 12 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> +hibernate-script-2.0-r6.ebuild,
+ -files/hibernate-script-baselayout2-clock.patch,
+ -hibernate-script-2.0-r5.ebuild:
+ Fix bug#268820, bug#268133, cleanup old ebuilds
18 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
Assign myself as maintainer
diff --git a/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch b/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
deleted file mode 100644
index eb5e7d03daed..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- scriptlets.d/clock.orig 2012-12-17 13:23:43.102996405 +0400
-+++ scriptlets.d/clock 2012-12-17 13:24:17.623996147 +0400
-@@ -10,7 +10,7 @@
- /etc/init.d/hwclock.sh stop > /dev/null 2>&1
- ;;
- gentoo)
-- /etc/init.d/clock.sh stop > /dev/null 2>&1
-+ /etc/init.d/hwclock stop > /dev/null 2>&1
- ;;
- *)
- if ! /sbin/hwclock $DIRECTISA --systohc ; then
-@@ -27,7 +27,7 @@
- /etc/init.d/hwclock.sh start > /dev/null 2>&1
- ;;
- gentoo)
-- /etc/init.d/clock.sh start > /dev/null 2>&1
-+ /etc/init.d/hwclock start > /dev/null 2>&1
- ;;
- *)
- if ! /sbin/hwclock $DIRECTISA --hctosys ; then
-@@ -44,7 +44,7 @@
- directisa)
- case "$DISTRIBUTION" in
- gentoo)
-- echo "$EXE: Options for hwclock should be set in /etc/init.d/clock.sh"
-+ echo "$EXE: Options for hwclock should be set in /etc/conf.d/hwclock"
- exit 1
- ;;
- debian|ubuntu)
diff --git a/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
index 814324c8c1f8..710708b94136 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild,v 1.1 2012/12/17 09:28:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild,v 1.1 2013/01/12 17:38:01 alonbl Exp $
EAPI=5
inherit eutils
-PATCH_VERSION="2"
+PATCH_VERSION="3"
DESCRIPTION="Hibernate script supporting multiple suspend methods"
HOMEPAGE="http://www.tuxonice.net/"
@@ -26,7 +26,6 @@ DOCS=( CHANGELOG README SCRIPTLET-API hibernate.vim )
src_prepare() {
epatch "${WORKDIR}/${PV}/"*.patch
- epatch "${FILESDIR}/${PN}-baselayout2-clock.patch" # fix for bug #406065
}
src_install() {