[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmemfree/files/, x11-plugins/wmmemfree/

[Mikle Kolyada]

commit:     ddccd1a3d7a8c6e9fefda54d109420d0ffbffca8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 22:47:27 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 22:47:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddccd1a3

x11-plugins/wmmemfree: remove last rited package (bug #639914)

 x11-plugins/wmmemfree/Manifest                     |  1 -
 .../wmmemfree-0.7-add-kernel-26-support.patch      | 83 ----------------------
 ...mfree-0.7-fix-crash-when-there-is-no-swap.patch | 18 -----
 x11-plugins/wmmemfree/metadata.xml                 |  9 ---
 x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild      | 40 -----------
 5 files changed, 151 deletions(-)

diff --git a/x11-plugins/wmmemfree/Manifest b/x11-plugins/wmmemfree/Manifest
deleted file mode 100644
index 5d240a230e2..00000000000
--- a/x11-plugins/wmmemfree/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wmmemfree-0.7.tar.bz2 14287 BLAKE2B 77a6fefbcc5b27d54815bde4d16e8eca90d9266499274fbfb003115a1fd21709f464a00479c287c898f4b1d1bb459d4811b1f56ebe8387b8063f0b515675fdb2 SHA512 cb612a867df55a96bc6b3b509c790548f95c57d25dda81c2babc03e52a06133b2f9b4339f37156c3ebcdeb65c49643ec03edc6f56a5f198d82475ff1d7e9368a

diff --git a/x11-plugins/wmmemfree/files/wmmemfree-0.7-add-kernel-26-support.patch b/x11-plugins/wmmemfree/files/wmmemfree-0.7-add-kernel-26-support.patch
deleted file mode 100644
index c4545d0654c..00000000000
--- a/x11-plugins/wmmemfree/files/wmmemfree-0.7-add-kernel-26-support.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur wmmemfree-0.7/mem_linux.c wmmemfree-0.7.new/mem_linux.c
---- wmmemfree-0.7/mem_linux.c	2003-03-17 14:23:05.000000000 +0100
-+++ wmmemfree-0.7/mem_linux.c	2004-08-28 23:18:56.783772744 +0200
-@@ -20,24 +20,48 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-+
-+long int mem_total, mem_used, mem_free, mem_buffers, mem_cached;
-+long int swp_total, swp_used, swp_free;
- 
--long long int mem_total, mem_used, mem_free, mem_shared, mem_buffers, mem_cached;
--long long int swp_total, swp_used, swp_free;
- 
- void mem_getfree()
- {
-- FILE *file;
-+	FILE *memfp;
-+
-+	static char buf[1024];
-+	static char *p_mem_tot=NULL, *p_mem_free, *p_mem_buffers, *p_mem_cache;
-+	static char *p_swap_total, *p_swap_free; 
-+
-+	memfp = fopen("/proc/meminfo", "r");
-+	if (!memfp)
-+	{
-+		perror("/proc/meminfo");
-+		exit(1);
-+	}
-+
-+ 	fread_unlocked (buf, 1024, 1, memfp);
-+	fclose(memfp);
-+
-+	if (!p_mem_tot)
-+	{
-+		p_mem_tot     = strstr(buf, "MemTotal:" ) + 13;
-+		p_mem_free    = strstr(buf, "MemFree:"  ) + 13;
-+		p_mem_buffers = strstr(buf, "Buffers:"  ) + 13;
-+		p_mem_cache   = strstr(buf, "Cached:"   ) + 13;
-+		p_swap_total  = strstr(buf, "SwapTotal:") + 13;
-+		p_swap_free   = strstr(buf, "SwapFree:" ) + 13;
-+	}
-+
-+	sscanf(p_mem_tot,     "%ld", &mem_total  );
-+	sscanf(p_mem_free,    "%ld", &mem_free   );
-+	sscanf(p_mem_buffers, "%ld", &mem_buffers);
-+	sscanf(p_mem_cache,   "%ld", &mem_cached );
-+	sscanf(p_swap_total,  "%ld", &swp_total );
-+	sscanf(p_swap_free,   "%ld", &swp_free  );
-+
-+	mem_used = mem_total - mem_free;
-+	swp_used = swp_total - swp_free;
- 
-- file = fopen("/proc/meminfo", "r");
-- if(!file)
-- {
--  perror("/proc/meminfo");
--  exit(1);
-- }
-- while(fgetc(file)!='\n'){}
-- fscanf(file, "%*s %Ld %Ld %Ld %Ld %Ld %Ld",
--        &mem_total, &mem_used, &mem_free, &mem_shared, &mem_buffers, &mem_cached);
-- fscanf(file, "%*s %Ld %Ld %Ld",
--        &swp_total, &swp_used, &swp_free);
-- fclose(file);
- }
-diff -Naur wmmemfree-0.7/mem_linux.h wmmemfree-0.7.new/mem_linux.h
---- wmmemfree-0.7/mem_linux.h	2003-03-22 19:51:35.000000000 +0100
-+++ wmmemfree-0.7/mem_linux.h	2004-08-28 23:12:19.066235000 +0200
-@@ -21,9 +21,9 @@
- #ifndef __MEM_LINUX_H__
- #define __MEM_LINUX_H__
- 
--extern long long int mem_total, mem_used;
--extern long long int mem_shared, mem_buffers, mem_cached;
--extern long long int swp_total, swp_used;
-+extern long int mem_total, mem_used;
-+extern long int mem_buffers, mem_cached;
-+extern long int swp_total, swp_used;
- 
- void mem_getfree();
- 

diff --git a/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch b/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch
deleted file mode 100644
index d062fd9ee09..00000000000
--- a/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- wmmemfree-0.7/draw.c	2003-03-21 21:56:25.000000000 +0100
-+++ wmmemfree-0.7/draw.c	2008-02-16 10:02:51.000000000 +0100
-@@ -44,13 +44,13 @@
-    XCopyArea(display, on, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 27);
-   else
-    XCopyArea(display, off, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 27);
--  if(n < (swp * 25 / swp_total))
-+  if(n < ((swp_total) ? (swp * 25 / swp_total) : 0))
-    XCopyArea(display, on, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 47);
-   else
-    XCopyArea(display, off, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 47);
-  }
-  mem_percent = mem * 100 / mem_total;
-- swp_percent = swp * 100 / swp_total;
-+ swp_percent = (swp_total) ? swp * 100 / swp_total : 0;
-  if(mem_percent == 100)
-   XCopyArea(display, numbers, buffer, gc, 5, 0, 5, 6, 33, 20);
-  else

diff --git a/x11-plugins/wmmemfree/metadata.xml b/x11-plugins/wmmemfree/metadata.xml
deleted file mode 100644
index 1d5e6504004..00000000000
--- a/x11-plugins/wmmemfree/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>voyageur@g.o</email>
-	<name>Bernard Cafarelli</name>
-</maintainer>
-
-</pkgmetadata>

diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
deleted file mode 100644
index 816a1dd48a6..00000000000
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a blue memory monitoring dockapp"
-HOMEPAGE="http://misuceldestept.go.ro/wmmemfree"
-SRC_URI="http://ibiblio.org/pub/linux/X11/xutils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-kernel-26-support.patch
-	epatch "${FILESDIR}"/${P}-fix-crash-when-there-is-no-swap.patch
-
-	#Honour Gentoo LDFLAGS, see bug #337927.
-	sed -e "s/-o \$(PROG)/\$(LDFLAGS) -o \$(PROG)/" -i Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
-		STRIP="true" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README THANKS TODO WMS
-}