x86 stable wrt #250263

(Portage version: 2.1.6.1/cvs/Linux 2.6.27.7 i686)

4 files changed, 7 insertions, 82 deletions

diff --git a/app-laptop/lphdisk/ChangeLog b/app-laptop/lphdisk/ChangeLog
index f4e1f1c8cdf2..b2f269fdf980 100644
--- a/app-laptop/lphdisk/ChangeLog
+++ b/app-laptop/lphdisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-laptop/lphdisk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/lphdisk/ChangeLog,v 1.8 2008/12/08 10:37:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/lphdisk/ChangeLog,v 1.9 2008/12/14 16:57:30 ssuominen Exp $
+
+  14 Dec 2008; <ssuominen@gentoo.org> lphdisk-0.9.1-r2.ebuild:
+  x86 stable wrt #250263
 
 *lphdisk-0.9.1-r2 (08 Dec 2008)
 
diff --git a/app-laptop/lphdisk/files/lphdisk-0.9.1-gcc3.patch b/app-laptop/lphdisk/files/lphdisk-0.9.1-gcc3.patch
deleted file mode 100644
index 19cc0d6cac81..000000000000
--- a/app-laptop/lphdisk/files/lphdisk-0.9.1-gcc3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- lphdisk-0.9.1/lphdisk.c
-+++ lphdisk-0.9.1/lphdisk.c
-@@ -718,22 +718,22 @@
-   {"force",     0, 0, 'f'},
- {0,0,0,0}};
- 
--const char usage_string[] = "\
--Usage: %1$s [options] [device]
--Prepare a hibernation partition for APM suspend-to-disk.
--
--options:
--  -h, --help       Display brief usage and option information (this screen)
--  -p, --probeonly  Only calculate and display required size, do not format
--  -q, --quiet      Turn off informational messages, useful for scripts
--  -d, --debug      Turn on (verbose) debugging messages
--  -n, --nowrite    Do not actually write to the disk
--  -f, --force      **DANGEROUS**  Format without regard to potential problems
--
--'device' should be a raw disk device (not a partition).  The default device
--is /dev/hda.
--
--(%2$s)\n\n";
-+const char usage_string[] = ""
-+"Usage: %1$s [options] [device]\n"
-+"Prepare a hibernation partition for APM suspend-to-disk.\n"
-+"\n"
-+"options:\n"
-+"  -h, --help       Display brief usage and option information (this screen)\n"
-+"  -p, --probeonly  Only calculate and display required size, do not format\n"
-+"  -q, --quiet      Turn off informational messages, useful for scripts\n"
-+"  -d, --debug      Turn on (verbose) debugging messages\n"
-+"  -n, --nowrite    Do not actually write to the disk\n"
-+"  -f, --force      **DANGEROUS**  Format without regard to potential problems\n"
-+"\n"
-+"'device' should be a raw disk device (not a partition).  The default device\n"
-+"is /dev/hda.\n"
-+"\n"
-+"(%2$s)\n\n";
- 
- void print_usage (void) {
-   char *progname = rindex(argv0, '/');
diff --git a/app-laptop/lphdisk/lphdisk-0.9.1-r1.ebuild b/app-laptop/lphdisk/lphdisk-0.9.1-r1.ebuild
deleted file mode 100644
index d9d9cf151a57..000000000000
--- a/app-laptop/lphdisk/lphdisk-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/lphdisk/lphdisk-0.9.1-r1.ebuild,v 1.3 2005/01/01 14:46:50 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="utility for preparing a hibernation partition for APM Suspend-To-Disk"
-HOMEPAGE="http://www.procyon.com/~pda/lphdisk/"
-SRC_URI="http://www.procyon.com/~pda/lphdisk/${P}.tar.bz2"
-
-# <chadh@gentoo.org>  I haven't actually tested that this doesn't work
-# on all the below - arches, but it won't work.  This only works on x86
-# laptops with Phoenix NoteBIOS.
-
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 -ppc -sparc -alpha"
-LICENSE="Artistic"
-DEPEND=">=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:/usr/local:usr:" \
-		-e "s:-g -Wall:${CFLAGS}:" \
-		Makefile
-	epatch ${FILESDIR}/${P}-gcc3.patch
-}
-
-src_compile() {
-
-	make || die
-}
-
-src_install() {
-	dosbin lphdisk
-	doman lphdisk.8
-}
diff --git a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild b/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild
index 342efb7a8f05..6f3a21697627 100644
--- a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild
+++ b/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild,v 1.1 2008/12/08 10:33:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild,v 1.2 2008/12/14 16:57:30 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.procyon.com/~pda/lphdisk/${P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="sys-libs/lrmi"
@@ -31,6 +31,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "This package is now using external lrmi library instead of shipped"
+	ewarn "This package is now using system lrmi library instead of shipped"
 	ewarn "copy it came with. This package is untested, use at your own risk."
 }