Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/ascpu/files/, x11-plugins/ascpu/
Date: Thu, 27 Apr 2017 12:17:41
Message-Id: 1493295427.59483d4a532a733292a2b0e0b8c5af70e9ad08a1.kensington@gentoo
1 commit: 59483d4a532a733292a2b0e0b8c5af70e9ad08a1
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 27 12:16:15 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 27 12:17:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59483d4a
7
8 x11-plugins/ascpu: remote 1.11-r0
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 x11-plugins/ascpu/ascpu-1.11.ebuild | 39 -------------------------
13 x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch | 36 -----------------------
14 2 files changed, 75 deletions(-)
15
16 diff --git a/x11-plugins/ascpu/ascpu-1.11.ebuild b/x11-plugins/ascpu/ascpu-1.11.ebuild
17 deleted file mode 100644
18 index 8d2b623bf58..00000000000
19 --- a/x11-plugins/ascpu/ascpu-1.11.ebuild
20 +++ /dev/null
21 @@ -1,39 +0,0 @@
22 -# Copyright 1999-2010 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -inherit eutils toolchain-funcs
26 -
27 -IUSE="jpeg"
28 -DESCRIPTION="CPU statistics monitor utility for X Windows"
29 -SRC_URI="http://www.tigr.net/afterstep/download/ascpu/${P}.tar.gz"
30 -HOMEPAGE="http://www.tigr.net"
31 -
32 -SLOT="0"
33 -LICENSE="GPL-2"
34 -KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
35 -
36 -RDEPEND="x11-libs/libXpm
37 - x11-libs/libSM
38 - jpeg? ( virtual/jpeg )"
39 -
40 -DEPEND="${RDEPEND}
41 - x11-proto/xproto"
42 -
43 -src_unpack() {
44 - unpack ${A}
45 - cd "${S}"
46 - epatch "${FILESDIR}"/${P}-gentoo.patch
47 -}
48 -
49 -src_compile() {
50 - econf $(use_enable jpeg) || die "econf failed"
51 - emake CC="$(tc-getCC)" || die "emake failed"
52 -}
53 -
54 -src_install() {
55 - dodir /usr/bin
56 - dodir /usr/share/man/man1
57 -
58 - emake DESTDIR="${D}" install || die "emake install failed"
59 - dodoc README
60 -}
61
62 diff --git a/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch b/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch
63 deleted file mode 100644
64 index b26374a4ac0..00000000000
65 --- a/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch
66 +++ /dev/null
67 @@ -1,36 +0,0 @@
68 ---- autoconf/Makefile.common.in.orig 1999-05-06 23:35:32.000000000 +0200
69 -+++ autoconf/Makefile.common.in 2006-09-11 23:07:41.000000000 +0200
70 -@@ -9,11 +9,10 @@
71 - install: install.bin install.man
72 -
73 - install.bin: $(PROG)
74 -- $(STRIP) $(PROG)
75 -- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
76 -+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
77 -
78 - install.man:
79 -- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
80 -+ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x
81 -
82 - uninstall:
83 - $(RMF) $(AFTER_BIN_DIR)/$(PROG)
84 ---- autoconf/Makefile.defines.in.orig 1999-05-06 23:35:32.000000000 +0200
85 -+++ autoconf/Makefile.defines.in 2006-09-11 23:17:40.000000000 +0200
86 -@@ -2,6 +2,7 @@
87 - # Copyright (c) 1998, Guylhem AZNAR <guylhem@×××××××.ca>
88 - #
89 -
90 -+DESTDIR =
91 - CC = @CC@
92 - CCFLAGS = @CFLAGS@
93 - # -march=pentiumpro -mcpu=pentiumpro
94 -@@ -21,7 +22,7 @@
95 - LEXFLAGS =
96 -
97 - INSTALL = @INSTALL@
98 --INSTALL_PROGRAM = @INSTALL@ -s -m 755
99 -+INSTALL_PROGRAM = @INSTALL@ -m 755
100 - INSTALL_DATA = @INSTALL@ -m 644
101 -
102 - INCS_X = @X_CFLAGS@
103 -