Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/tint2/, x11-misc/tint2/files/
Date: Tue, 07 Mar 2017 09:14:41
Message-Id: 1488877928.6867019eb0bc888f1e383f0cbe5e37a06421df7c.soap@gentoo
1 commit: 6867019eb0bc888f1e383f0cbe5e37a06421df7c
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 6 15:08:00 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 7 09:12:08 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6867019e
7
8 x11-misc/tint2: 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/tint2/Manifest | 1 -
14 x11-misc/tint2/files/battery_segfault.patch | 20 -----------
15 x11-misc/tint2/tint2-0.11-r2.ebuild | 55 -----------------------------
16 3 files changed, 76 deletions(-)
17
18 diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
19 index 9eaf5c4684e..7a6660f32aa 100644
20 --- a/x11-misc/tint2/Manifest
21 +++ b/x11-misc/tint2/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
24 DIST tint2-0.12.12.tar.gz 469724 SHA256 e4c6ffb67eb1242f19d94037b072602bc751ac71ca61352dea3465168e643450 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c WHIRLPOOL 197b92a93eb0368708824159bde41bd81143d0423a1f9ab83b2af4a11b3e3055a40481b9746f095e10cca84f7d772237a92d06bf267761021be308c0b3b5d553
25 DIST tint2-0.12.3.tar.gz 251977 SHA256 655cde38f4d358d69f3628f722c7da7768e193769ac876cc24b59f328bcd3d6c SHA512 8022895617905446bc01e548ece9df63d32ae1ef3bafc2de2c79fb2c0e91ab78d036e8c9165ea4d4224dd70edb510266bbea47baf382abbf27a275b60b7d1465 WHIRLPOOL 057ba74074d5e013d9c882a6cbef1bd75f80b1eba857bda933c5936511b1d2b9a519c770b1a2f31360774232e03962ca47dea73ad5f4ef21bcd6530d2c123662
26
27 diff --git a/x11-misc/tint2/files/battery_segfault.patch b/x11-misc/tint2/files/battery_segfault.patch
28 deleted file mode 100644
29 index 3f933e2f522..00000000000
30 --- a/x11-misc/tint2/files/battery_segfault.patch
31 +++ /dev/null
32 @@ -1,20 +0,0 @@
33 -Index: battery.c
34 -===================================================================
35 ---- src/battery/battery.c (revision 575)
36 -+++ src/battery/battery.c (revision 576)
37 -@@ -194,8 +194,14 @@
38 - }
39 - g_free(path2);
40 - }
41 -+
42 -+ path_current_now = g_build_filename(battery_dir, "power_now", NULL);
43 -+ if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
44 -+ g_free(path_current_now);
45 -+ path_current_now = g_build_filename(battery_dir, "current_now", NULL);
46 -+ }
47 -+
48 - if (path_energy_now && path_energy_full) {
49 -- path_current_now = g_build_filename(battery_dir, "current_now", NULL);
50 - path_status = g_build_filename(battery_dir, "status", NULL);
51 -
52 - // check file
53
54 diff --git a/x11-misc/tint2/tint2-0.11-r2.ebuild b/x11-misc/tint2/tint2-0.11-r2.ebuild
55 deleted file mode 100644
56 index b4ac0ede3cc..00000000000
57 --- a/x11-misc/tint2/tint2-0.11-r2.ebuild
58 +++ /dev/null
59 @@ -1,55 +0,0 @@
60 -# Copyright 1999-2015 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -
63 -EAPI="5"
64 -
65 -inherit cmake-utils
66 -
67 -MY_P="${PN}-${PV/_/-}"
68 -
69 -DESCRIPTION="A lightweight panel/taskbar"
70 -HOMEPAGE="https://gitlab.com/o9000/tint2"
71 -SRC_URI="https://tint2.googlecode.com/files/${MY_P}.tar.bz2"
72 -
73 -LICENSE="GPL-2"
74 -SLOT="0"
75 -KEYWORDS="amd64 x86"
76 -IUSE="battery examples tint2conf"
77 -
78 -COMMON_DEPEND="dev-libs/glib:2
79 - x11-libs/cairo
80 - x11-libs/pango[X]
81 - x11-libs/libX11
82 - x11-libs/libXinerama
83 - x11-libs/libXdamage
84 - x11-libs/libXcomposite
85 - x11-libs/libXrender
86 - x11-libs/libXrandr
87 - media-libs/imlib2[X]"
88 -DEPEND="${COMMON_DEPEND}
89 - virtual/pkgconfig
90 - x11-proto/xineramaproto"
91 -RDEPEND="${COMMON_DEPEND}
92 - tint2conf? ( x11-misc/tintwizard )"
93 -
94 -S="${WORKDIR}/${MY_P}"
95 -
96 -PATCHES=( "${FILESDIR}/battery_segfault.patch" ) # bug 343963
97 -
98 -src_configure() {
99 - local mycmakeargs=(
100 - $(cmake-utils_use_enable battery BATTERY)
101 - $(cmake-utils_use_enable examples EXAMPLES)
102 - $(cmake-utils_use_enable tint2conf TINT2CONF)
103 -
104 - # bug 296890
105 - "-DDOCDIR=/usr/share/doc/${PF}"
106 - )
107 -
108 - cmake-utils_src_configure
109 -}
110 -
111 -src_install() {
112 - cmake-utils_src_install
113 - rm -f "${D}/usr/bin/tintwizard.py"
114 -}