1 |
commit: f1ee029cfcbe924cd0e6234171eb05b7174e892e |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 9 15:14:33 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 9 15:14:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ee029c |
7 |
|
8 |
x11-misc/xbattbar: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
x11-misc/xbattbar/Manifest | 1 - |
13 |
x11-misc/xbattbar/files/xbattbar-1.4.3.patch | 38 -------------------------- |
14 |
x11-misc/xbattbar/xbattbar-1.4.3.ebuild | 41 ---------------------------- |
15 |
3 files changed, 80 deletions(-) |
16 |
|
17 |
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest |
18 |
index 2f80979989a..bc459cb5132 100644 |
19 |
--- a/x11-misc/xbattbar/Manifest |
20 |
+++ b/x11-misc/xbattbar/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32 |
23 |
DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 |
24 |
|
25 |
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch |
26 |
deleted file mode 100644 |
27 |
index ad5b9e49c1f..00000000000 |
28 |
--- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch |
29 |
+++ /dev/null |
30 |
@@ -1,38 +0,0 @@ |
31 |
---- Makefile |
32 |
-+++ Makefile |
33 |
-@@ -8,16 +8,16 @@ |
34 |
- all: $(TARGET) $(APM_CHECK) |
35 |
- |
36 |
- $(TARGET): obj/xbattbar.o |
37 |
-- gcc -o $@ $< -lX11 |
38 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11 |
39 |
- |
40 |
- obj/xbattbar.o: xbattbar.c obj/stamp |
41 |
-- gcc -MMD -o $@ -c $< |
42 |
-+ $(CC) $(CFLAGS) -MMD -o $@ -c $< |
43 |
- |
44 |
- $(APM_CHECK): obj/xbattbar-check-apm.o |
45 |
-- gcc -o $@ $< |
46 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< |
47 |
- |
48 |
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp |
49 |
-- gcc -MMD -D$(OS_TYPE) -o $@ -c $< |
50 |
-+ $(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< |
51 |
- |
52 |
- obj/stamp: |
53 |
- mkdir obj |
54 |
-@@ -29,11 +29,11 @@ |
55 |
- |
56 |
- |
57 |
- install: $(TARGET) $(APM_CHECK) |
58 |
-- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) |
59 |
-+ install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT) |
60 |
- install -d -m 0755 $(DESTDIR)/usr/bin |
61 |
- install -d -m 0755 $(DESTDIR)/usr/share/man/man1 |
62 |
-- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ |
63 |
-- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ |
64 |
-+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/ |
65 |
-+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/ |
66 |
- install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ |
67 |
- install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 |
68 |
- |
69 |
|
70 |
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild |
71 |
deleted file mode 100644 |
72 |
index 50b76944e6f..00000000000 |
73 |
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild |
74 |
+++ /dev/null |
75 |
@@ -1,41 +0,0 @@ |
76 |
-# Copyright 1999-2017 Gentoo Foundation |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
- |
79 |
-EAPI=2 |
80 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
81 |
- |
82 |
-DESCRIPTION="Advanced Power Management battery status display for X" |
83 |
-HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html" |
84 |
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" |
85 |
- |
86 |
-LICENSE="GPL-2" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="~amd64 ppc x86" |
89 |
-IUSE="" |
90 |
- |
91 |
-DEPEND="dev-lang/perl |
92 |
- x11-libs/libX11" |
93 |
-RDEPEND="${DEPEND} |
94 |
- !ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM |
95 |
- |
96 |
-# XXX: Avoiding imake in purpose here. |
97 |
- |
98 |
-src_prepare() { |
99 |
- epatch "${FILESDIR}"/${P}.patch |
100 |
- |
101 |
- sed -i \ |
102 |
- -e "s:usr/lib:usr/$(get_libdir):" \ |
103 |
- xbattbar.c || die |
104 |
-} |
105 |
- |
106 |
-src_compile() { |
107 |
- [[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64 |
108 |
- tc-export CC |
109 |
- use kernel_linux && append-flags -Dlinux |
110 |
- emake || die |
111 |
-} |
112 |
- |
113 |
-src_install() { |
114 |
- emake DESTDIR="${D}" install || die |
115 |
- dodoc README |
116 |
-} |