Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmisc/files/, x11-plugins/wmmisc/
Date: Wed, 19 Sep 2018 19:18:28
Message-Id: 1537384689.ddd0a7c72dedba4aa7c6c2f68fdd1152418989d8.zlogene@gentoo
1 commit: ddd0a7c72dedba4aa7c6c2f68fdd1152418989d8
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 19 19:18:09 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 19 19:18:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd0a7c7
7
8 x11-plugins/wmmisc: Drop old
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 x11-plugins/wmmisc/Manifest | 1 -
13 x11-plugins/wmmisc/files/wmmisc-1.1-build.patch | 48 -------------------------
14 x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild | 34 ------------------
15 x11-plugins/wmmisc/wmmisc-1.1.ebuild | 39 --------------------
16 4 files changed, 122 deletions(-)
17
18 diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
19 index cdd1a9808d8..84f02933417 100644
20 --- a/x11-plugins/wmmisc/Manifest
21 +++ b/x11-plugins/wmmisc/Manifest
22 @@ -1,2 +1 @@
23 DIST wmmisc-1.2.tar.gz 96087 BLAKE2B f48c9dc9afee04de7d437143deb870083e90d01768510b68df2c0e213cfb7ab956696f88d0a76c23a1ff5e5dd5c1d8e5c4640b6766dd7a948d1ad292f2b144fc SHA512 d8ed7c06665c28fb98e2a555c8abfcb7da9e0ae517031d24dce171f8a93775565471176d9dc8905043ae408b23c2f101eaccc364ecd8fa4816d2b529f7922d68
24 -DIST wmmisc_1.1.orig.tar.gz 18032 BLAKE2B 2e1957bc9e6efd0e646dc1403eac125d06fb7176ed92617f9d3e767c85b3d347dbe60e61da90e2c11ba160ddca29db28049f39dc89ab9bc45cc0068c27192a82 SHA512 9f9e93df309902e97a5b42a674bb06767a1cfa524553d140e370060c01a398bfdafcebfc806daa4b4f42b1422932512d48e33ebce444011ad410a5b460592582
25
26 diff --git a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch b/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
27 deleted file mode 100644
28 index 28979642dcb..00000000000
29 --- a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
30 +++ /dev/null
31 @@ -1,48 +0,0 @@
32 -diff -ur wmmisc-1.1.orig/src/general.mk wmmisc-1.1/src/general.mk
33 ---- a/general.mk 2006-01-07 19:50:31.000000000 +0200
34 -+++ b/general.mk 2008-01-16 20:44:59.000000000 +0200
35 -@@ -16,7 +16,7 @@
36 - MANDIR = $(PREFIX)/share/man
37 - # Set some destination locations.
38 -
39 --CC = gcc
40 -+CC ?= gcc
41 - CXX = g++
42 - # Set the compilers.
43 -
44 -@@ -45,13 +45,7 @@
45 - # Set the assembler and flags.
46 -
47 - LD = ld
48 --LDFLAGS = -lm
49 --ifeq ($(MODULAR_X),1)
50 --LDFLAGS += $(shell pkg-config --libs x11 xpm xext)
51 --else
52 --LDFLAGS += -L/usr/X11R6/lib -lX11 -lXpm -lXext
53 --endif
54 --LDFLAGS += -Wl,-O1
55 -+LIBS = -lm -lX11 -lXpm -lXext
56 - # Set the linker and flags.
57 -
58 - AR = ar
59 -@@ -64,7 +58,7 @@
60 - ifeq ($(MODULAR_X),1)
61 - INCLUDES = $(shell pkg-config --cflags x11 xpm xext)
62 - else
63 --INCLUDES = -I/usr/X11R6/include
64 -+INCLUDES = -I/usr/include
65 - endif
66 - INCLUDES += -I.
67 - # Set the include locations.
68 -diff -ur wmmisc-1.1.orig/src/Makefile wmmisc-1.1/src/Makefile
69 ---- a/Makefile 2006-01-07 20:45:59.000000000 +0200
70 -+++ b/Makefile 2008-01-16 20:43:31.000000000 +0200
71 -@@ -23,7 +23,7 @@
72 -
73 - $(package): $(objects)
74 - rm -f $(package)
75 -- $(CC) $(CFLAGS) -o $(package) $(objects) $(LDFLAGS)
76 -+ $(CC) $(LDFLAGS) -o $(package) $(objects) $(LIBS)
77 -
78 - wmgeneral.o: wmgeneral.c wmgeneral.h
79 - rm -f wmgeneral.o
80
81 diff --git a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
82 deleted file mode 100644
83 index dfcf13a8c09..00000000000
84 --- a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
85 +++ /dev/null
86 @@ -1,34 +0,0 @@
87 -# Copyright 1999-2018 Gentoo Foundation
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=7
91 -
92 -inherit toolchain-funcs
93 -
94 -DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
95 -HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
96 -SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
97 -
98 -LICENSE="GPL-2"
99 -SLOT="0"
100 -KEYWORDS="~amd64 ~ppc ~x86"
101 -
102 -S="${WORKDIR}/${P}/src"
103 -
104 -RDEPEND="x11-libs/libX11
105 - x11-libs/libXext
106 - x11-libs/libXpm"
107 -DEPEND="${RDEPEND}
108 - x11-base/xorg-proto"
109 -
110 -PATCHES=( "${FILESDIR}"/${P}-build.patch )
111 -
112 -src_compile() {
113 - tc-export CC
114 - emake
115 -}
116 -
117 -src_install() {
118 - dobin ${PN}
119 - dodoc ../{ChangeLog,README}
120 -}
121
122 diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
123 deleted file mode 100644
124 index 5b4d2a91fae..00000000000
125 --- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
126 +++ /dev/null
127 @@ -1,39 +0,0 @@
128 -# Copyright 1999-2018 Gentoo Foundation
129 -# Distributed under the terms of the GNU General Public License v2
130 -
131 -EAPI=0
132 -
133 -inherit eutils toolchain-funcs
134 -
135 -DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
136 -HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
137 -SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
138 -
139 -LICENSE="GPL-2"
140 -SLOT="0"
141 -KEYWORDS="~amd64 ~ppc x86"
142 -IUSE=""
143 -
144 -S=${WORKDIR}/${P}/src
145 -
146 -RDEPEND="x11-libs/libX11
147 - x11-libs/libXext
148 - x11-libs/libXpm"
149 -DEPEND="${RDEPEND}
150 - x11-base/xorg-proto"
151 -
152 -src_unpack() {
153 - unpack ${A}
154 - cd "${S}"
155 - epatch "${FILESDIR}"/${P}-build.patch
156 -}
157 -
158 -src_compile() {
159 - tc-export CC
160 - emake || die "emake failed."
161 -}
162 -
163 -src_install() {
164 - dobin ${PN}
165 - dodoc ../{ChangeLog,README}
166 -}