From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB7691382C5 for ; Wed, 18 Apr 2018 20:03:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58012E0896; Wed, 18 Apr 2018 20:03:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24D28E0896 for ; Wed, 18 Apr 2018 20:03:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFBC5335C77 for ; Wed, 18 Apr 2018 20:03:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B6C3288 for ; Wed, 18 Apr 2018 20:03:01 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1524081758.3e1beea8b4adba0c3a4e6808559184e308da5234.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-laptop/lphdisk/, profiles/, app-laptop/lphdisk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-laptop/lphdisk/Manifest app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild app-laptop/lphdisk/metadata.xml profiles/package.mask X-VCS-Directories: profiles/ app-laptop/lphdisk/files/ app-laptop/lphdisk/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3e1beea8b4adba0c3a4e6808559184e308da5234 X-VCS-Branch: master Date: Wed, 18 Apr 2018 20:03:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 866e385d-62a6-4b9c-a8a2-b107ffa26896 X-Archives-Hash: fe8b582dbaa28e71fa752c218d9894e9 commit: 3e1beea8b4adba0c3a4e6808559184e308da5234 Author: David Seifert gentoo org> AuthorDate: Wed Apr 18 20:00:40 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Apr 18 20:02:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1beea8 app-laptop/lphdisk: Remove from tree Closes: https://bugs.gentoo.org/648102 app-laptop/lphdisk/Manifest | 1 - .../lphdisk/files/lphdisk-0.9.1-gentoo.patch | 252 --------------------- app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild | 29 --- app-laptop/lphdisk/metadata.xml | 5 - profiles/package.mask | 5 - 5 files changed, 292 deletions(-) diff --git a/app-laptop/lphdisk/Manifest b/app-laptop/lphdisk/Manifest deleted file mode 100644 index e7ccbbdf074..00000000000 --- a/app-laptop/lphdisk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lphdisk-0.9.1.tar.bz2 26343 BLAKE2B 4e75da917ff733d5f5dae188b301373bbed8f7772a48d0cfd6fa006987531c8124bcce8752216a49018c6a6db081b78d870d3588219c05435a6db9d9da861f76 SHA512 28bd93acd854e79009722e83f063c3704333ae97d7fadff194101f24bd9fdc81c98464a3c0e7bbaf6097a56bed19fc7798e108ec7872cc85f3e327fbfb942521 diff --git a/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch b/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch deleted file mode 100644 index 73e1b5a715f..00000000000 --- a/app-laptop/lphdisk/files/lphdisk-0.9.1-gentoo.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff -ur lphdisk-0.9.1.orig/lphdisk.c lphdisk-0.9.1/lphdisk.c ---- lphdisk-0.9.1.orig/lphdisk.c 2002-02-12 13:04:27.000000000 +0200 -+++ lphdisk-0.9.1/lphdisk.c 2008-12-08 12:21:29.000000000 +0200 -@@ -19,8 +19,10 @@ - Be careful! - */ - -+#define _LARGEFILE64_SOURCE - #include - #include -+#include - #include - #include - #include -@@ -29,8 +31,8 @@ - #include - #include - #include --#include "lrmi.h" --#include "vbe.h" -+#include -+#include - - /* General Program Defines: */ - -@@ -100,58 +102,6 @@ - /* General Purpose Utility Routines */ - /*****************************************************************************/ - --/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ --/* The following is a hack to take advantage of the ext2 "_llseek" system */ --/* call to do seeks to "long long" offsets under linux (this is needed to */ --/* seek to sectors beyond 4194303 (2GB)). This isn't directly supported by */ --/* glibc, so we need to make our own interface function for it. We should */ --/* be able to get the _NR__llseek define from linux/unistd.h. From this we */ --/* can construct a wrapper to perform the right system call. */ -- --#include /* for __NR__llseek */ -- --typedef long long lloff_t; -- --#ifdef __NR__llseek -- --static _syscall5(int,_llseek, unsigned int,fd, unsigned long,offset_high, -- unsigned long,offset_low, lloff_t *,result, -- unsigned int,origin) -- --lloff_t llseek (unsigned int fd, lloff_t offset, unsigned int origin) { -- lloff_t result; -- int retval; -- -- retval = _llseek (fd, ((unsigned long long) offset) >> 32, -- ((unsigned long long) offset) & 0xffffffff, -- &result, origin); -- return (retval == -1 ? (lloff_t) retval : result); --} -- --#else /* __NR__llseek */ -- --/* Somehow, __NR__llseek wasn't in linux/unistd.h. This shouldn't ever */ --/* happen, but better safe than sorry.. The best we can do is emulate it */ --/* with lseek, and hope we don't get an offset that's too large (throw an */ --/* error if we do) */ -- --lloff_t llseek (unsigned int fd, lloff_t offset, unsigned int origin) { -- off_t offt_offset = (off_t) offset; -- -- if ((lloff_t)offt_offset != offset) { -- /* converting to off_t and back yields different result, indicating an */ -- /* overflow.. */ -- errno = EINVAL; -- return -1; -- } else { -- return lseek(fd, offt_offset, origin); -- } --} -- --#endif /* __NR__llseek */ -- --/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -- - #define get16(p) get_int_le(p,2) - #define get32(p) get_int_le(p,4) - -@@ -189,9 +139,9 @@ - /* success, nonzero on error. */ - - int seek_sector (int fd, size_t secno) { -- lloff_t offset = (lloff_t) secno * SECTOR_SIZE; -+ off64_t offset = (off64_t) secno * SECTOR_SIZE; - -- if (llseek(fd, offset, SEEK_SET) == (lloff_t) -1) -+ if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1) - return -1; - - return 0; -@@ -556,25 +506,29 @@ - - int meminfo_physmem(void) { - FILE *f; -- unsigned int size; -+ unsigned int size = 0; - int ramsize; -+ char s[128]; - - if (!(f = fopen(meminfo_filename, "r"))) { - debug("Unable to open %s: %s\n", meminfo_filename, strerror(errno)); - return 0; - } -- fscanf(f, "%*[^\n]\n"); /* Read the header line and discard it */ - -- if (fscanf(f, "Mem: %u", &size) != 1) { -+ while (fgets(s, sizeof(s), f)) { -+ if (sscanf(s, "MemTotal: %u", &size) == 1) { -+ break; -+ } -+ } -+ if (size == 0) { - debug("Parse of %s failed.\n", meminfo_filename); - return 0; - } - fclose(f); - -- /* convert to KB and then round up to the next power of 2 (since RAM */ -+ /* size is in KB and then round up to the next power of 2 (since RAM */ - /* sizes don't come in anything else, so this should correct for the */ - /* kernel size, etc) */ -- size >>= 10; - debug("%s reports memory size of %d KB", meminfo_filename, size); - for (ramsize = 1; size; size >>= 1) ramsize <<= 1; - -@@ -718,22 +672,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, '/'); -@@ -750,7 +704,7 @@ - dev_t dev; - int partition; - int ramsize, vramsize, required_size; -- size_t required_sectors; -+ size_t required_sectors = 0; - - argv0 = argv[0]; - -@@ -821,9 +775,9 @@ - } - - if (!required_size) { -- if (!quiet_flag) printf("Reccomended partition size is unknown.\n"); -+ if (!quiet_flag) printf("Recommended partition size is unknown.\n"); - } else { -- if (!quiet_flag) printf("Reccomended partition size is %d MB" -+ if (!quiet_flag) printf("Recommended partition size is %d MB" - " (%d sectors)\n", ((required_size+1023) >> 10), - required_sectors); - } -@@ -923,7 +877,7 @@ - - if ((pi[partition-1].size < required_sectors) && !quiet_flag) { - fprintf(stderr, "Warning: hibernate partition size (%d) is smaller than" -- " reccomended size (%d).\n", pi[partition-1].size, -+ " recommended size (%d).\n", pi[partition-1].size, - required_sectors); - } - -diff -ur lphdisk-0.9.1.orig/Makefile lphdisk-0.9.1/Makefile ---- lphdisk-0.9.1.orig/Makefile 2002-02-12 11:06:46.000000000 +0200 -+++ lphdisk-0.9.1/Makefile 2008-12-08 12:26:49.000000000 +0200 -@@ -4,37 +4,28 @@ - # lphdisk 0.9.1 - # - --INSTALL_PREFIX = /usr/local -+INSTALL_PREFIX = /usr - --CFLAGS = -g -Wall --LIBS = -- --LRMIDIR = lrmi-0.6m -+CFLAGS += -Wall -+LIBS = -llrmi - - all: lphdisk - --lphdisk: lphdisk.o lrmi.o -- $(CC) $(CFLAGS) -o lphdisk lphdisk.o lrmi.o $(LIBS) -- --lphdisk.o: lphdisk.c lrmi.h vbe.h -- --lrmi.o: -- cd $(LRMIDIR) && $(MAKE) $@ -- cp $(LRMIDIR)/lrmi.o . -+lphdisk: lphdisk.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o lphdisk lphdisk.o $(LIBS) - --%.h: $(LRMIDIR)/%.h -- cp $^ $@ -+lphdisk.o: lphdisk.c - - install: all -- install -m 755 lphdisk $(INSTALL_PREFIX)/sbin -- install -m 644 lphdisk.8 $(INSTALL_PREFIX)/man/man8 -+ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/sbin -+ install -m 755 lphdisk $(DESTDIR)$(INSTALL_PREFIX)/sbin -+ mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/share/man/man8 -+ install -m 644 lphdisk.8 $(DESTDIR)$(INSTALL_PREFIX)/share/man/man8 - - clean: -- cd $(LRMIDIR) && $(MAKE) $@ -- rm -f *.o lrmi.h vbe.h -+ rm -f *.o - - distclean: clean -- cd $(LRMIDIR) && $(MAKE) $@ - rm -f lphdisk - - .PHONY: all install clean distclean diff --git a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild b/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild deleted file mode 100644 index 9139bb49d66..00000000000 --- a/app-laptop/lphdisk/lphdisk-0.9.1-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit eutils toolchain-funcs - -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" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND="sys-libs/lrmi" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -src_compile() { - tc-export CC - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/app-laptop/lphdisk/metadata.xml b/app-laptop/lphdisk/metadata.xml deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/app-laptop/lphdisk/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/profiles/package.mask b/profiles/package.mask index 6f68926da4f..ffd47dcc31a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -345,11 +345,6 @@ app-editors/cooledit # month. app-mobilephone/ringtonetools -# Pacho Ramos (18 Mar 2018) -# Dead for years, probably not needed anymore at present time (#648102). -# Removal in a month. -app-laptop/lphdisk - # Pacho Ramos (18 Mar 2018) # Dead for a long time, broken with current kernels (#648392). Removal in a # month.