Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lcdtest/files/, sys-apps/lcdtest/, profiles/
Date: Mon, 26 Oct 2020 07:39:44
Message-Id: 1603697933.949a89e26129acbe36f713bea850e4d19ebc98cc.mgorny@gentoo
1 commit: 949a89e26129acbe36f713bea850e4d19ebc98cc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 07:27:05 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 07:38:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949a89e2
7
8 sys-apps/lcdtest: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735560
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sys-apps/lcdtest/Manifest | 1 -
15 sys-apps/lcdtest/files/1.18-build-system.patch | 62 --------------------------
16 sys-apps/lcdtest/lcdtest-1.18.ebuild | 60 -------------------------
17 sys-apps/lcdtest/metadata.xml | 11 -----
18 5 files changed, 135 deletions(-)
19
20 diff --git a/profiles/package.mask b/profiles/package.mask
21 index 107f9353159..3609048310e 100644
22 --- a/profiles/package.mask
23 +++ b/profiles/package.mask
24 @@ -268,7 +268,6 @@ games-strategy/glob2
25 net-vpn/freelan
26 sci-geosciences/mapnik
27 sci-visualization/nonolith-connect
28 -sys-apps/lcdtest
29
30 # Michał Górny <mgorny@g.o> (2020-09-25)
31 # PyPy3.7 alpha. Known to break a few packages. Masked until it
32
33 diff --git a/sys-apps/lcdtest/Manifest b/sys-apps/lcdtest/Manifest
34 deleted file mode 100644
35 index c7065d09c6e..00000000000
36 --- a/sys-apps/lcdtest/Manifest
37 +++ /dev/null
38 @@ -1 +0,0 @@
39 -DIST lcdtest-1.18.tar.gz 26886 BLAKE2B e5ee71c49c65df04d380cbb922a067653bbfb787a6e9376ec8989fee27466895e569813c06c1eb561cf7e3aec48b89920adace2dd3230dda158a7c5bd7badda7 SHA512 74b0739c5dcc5ff9307ca526b4a6bbd92d6e58a83ceeed5a37a4064e3e4ed0cbdfe7a2a70cd56ba1a7305c3fd72510e10a02098aab11828062a3999cac944ab7
40
41 diff --git a/sys-apps/lcdtest/files/1.18-build-system.patch b/sys-apps/lcdtest/files/1.18-build-system.patch
42 deleted file mode 100644
43 index 429067259c5..00000000000
44 --- a/sys-apps/lcdtest/files/1.18-build-system.patch
45 +++ /dev/null
46 @@ -1,62 +0,0 @@
47 -diff -uNr lcdtest-1.18.ORIG/SConstruct lcdtest-1.18/SConstruct
48 ---- lcdtest-1.18.ORIG/SConstruct 2013-04-17 14:32:37.735358663 +0100
49 -+++ lcdtest-1.18/SConstruct 2013-04-17 14:33:52.706359788 +0100
50 -@@ -119,10 +119,10 @@
51 - # code
52 - #-----------------------------------------------------------------------------
53 -
54 --build_dir = 'build/'
55 -+variant_dir = 'build/'
56 -
57 - SConscript ('src/SConscript',
58 -- build_dir = build_dir,
59 -+ variant_dir = variant_dir,
60 - duplicate = 0,
61 - exports = {'env' : env})
62 -
63 -@@ -137,7 +137,7 @@
64 - #-----------------------------------------------------------------------------
65 -
66 - SConscript ('desktop/SConscript',
67 -- build_dir = build_dir + '/desktop',
68 -+ variant_dir = variant_dir + '/desktop',
69 - duplicate = 0)
70 -
71 - #-----------------------------------------------------------------------------
72 -diff -uNr lcdtest-1.18.ORIG/src/SConscript lcdtest-1.18/src/SConscript
73 ---- lcdtest-1.18.ORIG/src/SConscript 2013-04-17 14:32:37.734358663 +0100
74 -+++ lcdtest-1.18/src/SConscript 2013-04-17 14:32:54.194358910 +0100
75 -@@ -17,6 +17,7 @@
76 - # along with this program. If not, see see <http://www.gnu.org/licenses/>.
77 -
78 - import os
79 -+import SCons.Util
80 -
81 - Import('env')
82 -
83 -@@ -29,13 +30,18 @@
84 -
85 - objs = [env.Object(src) for src in srcs]
86 -
87 --# respect the environment CFLAGS if given
88 --if 'CFLAGS' in ARGUMENTS:
89 -- env.MergeFlags (ARGUMENTS ['CFLAGS'])
90 --elif 'CFLAGS' in os.environ:
91 -- env.MergeFlags (os.environ ['CFLAGS'])
92 --else:
93 -- env.Append (CCFLAGS = ['-g', '-Wall', '-Wextra'])
94 -+# respect the environments flags if given
95 -+
96 -+if os.environ.has_key('CC'):
97 -+ env['CC'] = os.environ['CC']
98 -+if os.environ.has_key('CFLAGS'):
99 -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
100 -+if os.environ.has_key('CXX'):
101 -+ env['CXX'] = os.environ['CXX']
102 -+if os.environ.has_key('CXXFLAGS'):
103 -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
104 -+if os.environ.has_key('LDFLAGS'):
105 -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
106 -
107 - env.Append (LIBS = ['SDL', 'SDL_image', 'SDL_ttf']);
108 -
109
110 diff --git a/sys-apps/lcdtest/lcdtest-1.18.ebuild b/sys-apps/lcdtest/lcdtest-1.18.ebuild
111 deleted file mode 100644
112 index 4b5876b1bab..00000000000
113 --- a/sys-apps/lcdtest/lcdtest-1.18.ebuild
114 +++ /dev/null
115 @@ -1,60 +0,0 @@
116 -# Copyright 1999-2014 Gentoo Foundation
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=5
120 -
121 -inherit scons-utils eutils toolchain-funcs gnome2-utils
122 -
123 -DESCRIPTION="Displays test patterns to spot dead/hot pixels on LCD screens"
124 -HOMEPAGE="http://www.brouhaha.com/~eric/software/lcdtest/"
125 -SRC_URI="http://www.brouhaha.com/~eric/software/lcdtest/download/${P}.tar.gz"
126 -
127 -LICENSE="GPL-3"
128 -SLOT="0"
129 -KEYWORDS="~amd64 ~x86"
130 -IUSE=""
131 -
132 -DEPEND="
133 - >=media-libs/libsdl-1.2.7-r2[X,video]
134 - >=media-libs/sdl-image-1.2.3-r1
135 - >=media-libs/sdl-ttf-2.0.9
136 -"
137 -RDEPEND="${DEPEND}
138 - media-fonts/liberation-fonts
139 -"
140 -
141 -src_prepare() {
142 - epatch "${FILESDIR}/${PV}-build-system.patch"
143 - epatch_user
144 - sed -i -e \
145 - "s|/usr/share/fonts/liberation/|/usr/share/fonts/liberation-fonts/|" \
146 - src/lcdtest.c || die
147 -}
148 -
149 -src_configure() {
150 - tc-export CC
151 - myesconsargs=(
152 - --prefix="${EPREFIX}/usr"
153 - )
154 -}
155 -
156 -src_compile() {
157 - escons
158 -}
159 -
160 -src_install() {
161 - escons --buildroot="${D}" install
162 - dodoc README
163 -}
164 -
165 -pkg_preinst() {
166 - gnome2_icon_savelist
167 -}
168 -
169 -pkg_postinst() {
170 - gnome2_icon_cache_update
171 -}
172 -
173 -pkg_postrm() {
174 - gnome2_icon_cache_update
175 -}
176
177 diff --git a/sys-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml
178 deleted file mode 100644
179 index f35b285c1ee..00000000000
180 --- a/sys-apps/lcdtest/metadata.xml
181 +++ /dev/null
182 @@ -1,11 +0,0 @@
183 -<?xml version="1.0" encoding="UTF-8"?>
184 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
185 -<pkgmetadata>
186 -<maintainer type="person">
187 - <email>chainsaw@g.o</email>
188 -</maintainer>
189 -<maintainer type="project">
190 - <email>base-system@g.o</email>
191 - <name>Gentoo Base System</name>
192 -</maintainer>
193 -</pkgmetadata>