1 |
commit: 3b16491e4dcaac0864cfe42d32cf72495777b508 |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Mar 6 15:12:47 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 7 09:12:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b16491e |
7 |
|
8 |
x11-misc/xbattbar: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4142 |
12 |
|
13 |
x11-misc/xbattbar/Manifest | 2 -- |
14 |
x11-misc/xbattbar/files/xbattbar-1.4.4.patch | 40 ----------------------- |
15 |
x11-misc/xbattbar/xbattbar-1.4.4.ebuild | 43 ------------------------- |
16 |
x11-misc/xbattbar/xbattbar-1.4.5.ebuild | 48 ---------------------------- |
17 |
4 files changed, 133 deletions(-) |
18 |
|
19 |
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest |
20 |
index f08aa2a917d..774f81bc99f 100644 |
21 |
--- a/x11-misc/xbattbar/Manifest |
22 |
+++ b/x11-misc/xbattbar/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32 WHIRLPOOL a6639a36f2473d2f47b01ae698817e5a5054db853306c3d793c5e3f1951bf7c6a576c28174b21723c72f1e9fb133df0a12dfef9f930b6448550f46d375708ced |
25 |
-DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740 |
26 |
-DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884 |
27 |
DIST xbattbar_1.4.8.orig.tar.gz 16254 SHA256 d7f5cb83a783c3f3376ddb83b90bec90a70d62ff30b8819cf674bf9341677939 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 WHIRLPOOL 8cd6d35ee4d75df20babd4127ac7be6ac9ff2086fcc10572bff65af1a9d1635bf9ec2590d2aebec56b2c6aaf99d18368490092dc730325d92e4aa2eee2e88981 |
28 |
|
29 |
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch |
30 |
deleted file mode 100644 |
31 |
index 0a17a4cd1a5..00000000000 |
32 |
--- a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch |
33 |
+++ /dev/null |
34 |
@@ -1,40 +0,0 @@ |
35 |
---- a/Makefile |
36 |
-+++ b/Makefile |
37 |
-@@ -8,16 +8,16 @@ |
38 |
- all: $(TARGET) $(APM_CHECK) |
39 |
- |
40 |
- $(TARGET): obj/xbattbar.o |
41 |
-- gcc -o $@ $< -lX11 |
42 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11 |
43 |
- |
44 |
- obj/xbattbar.o: xbattbar.c obj/stamp |
45 |
-- gcc -MMD -o $@ -c $< |
46 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -o $@ -c $< |
47 |
- |
48 |
- $(APM_CHECK): obj/xbattbar-check-apm.o |
49 |
-- gcc -o $@ $< |
50 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< |
51 |
- |
52 |
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp |
53 |
-- gcc -MMD -D$(OS_TYPE) -o $@ -c $< |
54 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< |
55 |
- |
56 |
- obj/stamp: |
57 |
- mkdir obj |
58 |
-@@ -29,12 +29,12 @@ |
59 |
- |
60 |
- |
61 |
- install: $(TARGET) $(APM_CHECK) |
62 |
-- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) |
63 |
-+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT) |
64 |
- install -d -m 0755 $(DESTDIR)/usr/bin |
65 |
- install -d -m 0755 $(DESTDIR)/usr/share/man/man1 |
66 |
-- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ |
67 |
-- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ |
68 |
-- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/ |
69 |
-+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ |
70 |
-+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ |
71 |
-+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ |
72 |
- install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ |
73 |
- install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 |
74 |
- |
75 |
|
76 |
diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild |
77 |
deleted file mode 100644 |
78 |
index 1ad8948f287..00000000000 |
79 |
--- a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,43 +0,0 @@ |
82 |
-# Copyright 1999-2015 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=5 |
86 |
-PYTHON_COMPAT=( python2_7 ) |
87 |
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs |
88 |
- |
89 |
-DESCRIPTION="Advanced Power Management battery status display for X" |
90 |
-HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html" |
91 |
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" |
92 |
- |
93 |
-LICENSE="GPL-2" |
94 |
-SLOT="0" |
95 |
-KEYWORDS="~amd64 ~ppc ~x86" |
96 |
- |
97 |
-DEPEND=" |
98 |
- dev-lang/perl |
99 |
- x11-libs/libX11 |
100 |
-" |
101 |
-RDEPEND=" |
102 |
- ${DEPEND} |
103 |
- ${PYTHON_DEPS} |
104 |
- !ppc? ( >=sys-power/acpi-1.5 ) |
105 |
-" # ppc has APM |
106 |
- |
107 |
-src_prepare() { |
108 |
- epatch "${FILESDIR}"/${PN}-1.4.4.patch |
109 |
- |
110 |
- sed -i \ |
111 |
- -e "s:usr/lib:usr/$(get_libdir):" \ |
112 |
- xbattbar.c || die |
113 |
-} |
114 |
- |
115 |
-src_compile() { |
116 |
- use kernel_linux && append-flags -Dlinux |
117 |
- emake CC=$(tc-getCC) LIBDIR="$(get_libdir)" |
118 |
- python_fix_shebang ${PN}-check-sys |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- emake install DESTDIR="${D}" LIBDIR="$(get_libdir)" |
123 |
- dodoc README |
124 |
-} |
125 |
|
126 |
diff --git a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild |
127 |
deleted file mode 100644 |
128 |
index 002d77a4795..00000000000 |
129 |
--- a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,48 +0,0 @@ |
132 |
-# Copyright 1999-2015 Gentoo Foundation |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
- |
135 |
-EAPI=5 |
136 |
-PYTHON_COMPAT=( python2_7 ) |
137 |
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs |
138 |
- |
139 |
-DESCRIPTION="Advanced Power Management battery status display for X" |
140 |
-HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html" |
141 |
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" |
142 |
- |
143 |
-LICENSE="GPL-2" |
144 |
-SLOT="0" |
145 |
-KEYWORDS="~amd64 ~ppc ~x86" |
146 |
- |
147 |
-DEPEND=" |
148 |
- dev-lang/perl |
149 |
- x11-libs/libX11 |
150 |
-" |
151 |
-RDEPEND=" |
152 |
- ${DEPEND} |
153 |
- ${PYTHON_DEPS} |
154 |
- !ppc? ( >=sys-power/acpi-1.5 ) |
155 |
-" # ppc has APM |
156 |
- |
157 |
-src_prepare() { |
158 |
- epatch "${FILESDIR}"/${PN}-1.4.5.patch |
159 |
- |
160 |
- sed -i \ |
161 |
- -e "s:usr/lib:usr/$(get_libdir):" \ |
162 |
- xbattbar.c || die |
163 |
- |
164 |
- tc-export PKG_CONFIG |
165 |
-} |
166 |
- |
167 |
-src_compile() { |
168 |
- use kernel_linux && append-flags -Dlinux |
169 |
- emake \ |
170 |
- CC=$(tc-getCC) \ |
171 |
- LIBDIR="$(get_libdir)" \ |
172 |
- LDFLAGS="${LDFLAGS}" |
173 |
- python_fix_shebang ${PN}-check-sys |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install |
178 |
- dodoc README |
179 |
-} |