Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lingot/, media-sound/lingot/files/
Date: Mon, 27 Feb 2023 09:04:27
Message-Id: 1677488648.0177f9a968f803bd0138112bb654b0515791aa7b.juippis@gentoo
1 commit: 0177f9a968f803bd0138112bb654b0515791aa7b
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Mon Feb 27 00:11:01 2023 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 09:04:08 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0177f9a9
7
8 media-sound/lingot: drop 1.0.1
9
10 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 media-sound/lingot/Manifest | 1 -
14 .../lingot/files/lingot-1.0.1-configure.patch | 217 ---------------------
15 media-sound/lingot/lingot-1.0.1.ebuild | 54 -----
16 3 files changed, 272 deletions(-)
17
18 diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
19 index 22d79737735d..4c7f947233db 100644
20 --- a/media-sound/lingot/Manifest
21 +++ b/media-sound/lingot/Manifest
22 @@ -1,2 +1 @@
23 -DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
24 DIST lingot-1.1.1.tar.gz 727028 BLAKE2B c681fcd72f67ae20e49f0229aa9791eace1f65cb596c60e52cff7805bc70d6d418cd87c96629306163756db81236ad31b6c8fe78b7ee401d155f8f81dda4f334 SHA512 71ee6b992a8f9cfe4a90d7cd8ba0098512857d65d773d3d5ec26aeeaa104ee812051b9d6b86c5e6462d1032bf03d7e6120aecd60ca8758fdf96c37f2d7ceacc7
25
26 diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
27 deleted file mode 100644
28 index f39dc3d9ad55..000000000000
29 --- a/media-sound/lingot/files/lingot-1.0.1-configure.patch
30 +++ /dev/null
31 @@ -1,217 +0,0 @@
32 -From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
33 -From: Nicolas Boulenguez <nicolas.boulenguez@××××.fr>
34 -Date: Sat, 14 Jul 2018 09:40:37 +0200
35 -Subject: [PATCH] Remove unused variables from configure.ac.
36 -
37 -Also replace
38 - configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
39 - configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
40 -and
41 - Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
42 -with
43 - Makefile.am : .. = $(datadir)/foo
44 -for simplicity and conformity with the usual meaning of datadir.
45 -
46 -These changes may require regeneration by Anjuta.
47 ----
48 - Makefile.am | 2 +-
49 - configure.ac | 85 -----------------------------------------------
50 - icons/Makefile.am | 2 +-
51 - 3 files changed, 2 insertions(+), 87 deletions(-)
52 -
53 -diff --git a/Makefile.am b/Makefile.am
54 -index db5ec16..d61162f 100644
55 ---- a/Makefile.am
56 -+++ b/Makefile.am
57 -@@ -27,7 +27,7 @@ DISTCLEANFILES = \
58 - m4/* \
59 - po/Makefile.in.in
60 -
61 --gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
62 -+gnomemenudir = $(datadir)/applications
63 - gnomemenu_DATA = org.nongnu.lingot.desktop
64 - appdatadir = $(datadir)/metainfo
65 - appdata_DATA = org.nongnu.lingot.appdata.xml
66 -diff --git a/configure.ac b/configure.ac
67 -index 08f208f..cfb1259 100644
68 ---- a/configure.ac
69 -+++ b/configure.ac
70 -@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
71 - fi
72 - fi
73 -
74 --
75 --dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
76 --dnl AC_SUBST(GLADE_CFLAGS)
77 --dnl AC_SUBST(GLADE_LIBS)
78 --
79 --dnl Set PACKAGE_LOCALE_DIR in config.h.
80 --if test "x${prefix}" = "xNONE"; then
81 -- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
82 --else
83 -- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
84 --fi
85 --
86 --dnl Set PACKAGE SOURCE DIR in config.h.
87 --packagesrcdir=`cd $srcdir && pwd`
88 --
89 --dnl Set PACKAGE PREFIX
90 --if test "x${prefix}" = "xNONE"; then
91 -- packageprefix=${ac_default_prefix}
92 --else
93 -- packageprefix=${prefix}
94 --fi
95 --
96 --dnl Set PACKAGE DATA & DOC DIR
97 --packagedatadir=share
98 --packagedocdir=doc/${PACKAGE}
99 --
100 --dnl Set PACKAGE DIRs in config.h.
101 --packagepixmapsdir=share/pixmaps/${PACKAGE}
102 --packageicondir=share/icons/hicolor/scalable/apps/
103 --packagehelpdir=share/gnome/help/${PACKAGE}
104 --packagemenudir=share/applications
105 --
106 --dnl Subst PACKAGE_DATA_DIR.
107 --NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
108 --AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
109 --PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
110 --AC_SUBST(PACKAGE_DATA_DIR)
111 --
112 --dnl Subst PACKAGE_DOC_DIR.
113 --NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
114 --AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
115 --PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
116 --AC_SUBST(PACKAGE_DOC_DIR)
117 --
118 --dnl Subst PACKAGE_PIXMAPS_DIR.
119 --NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
120 --AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
121 --PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
122 --AC_SUBST(PACKAGE_PIXMAPS_DIR)
123 --
124 --dnl Subst PACKAGE_ICON_DIR.
125 --NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
126 --AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
127 --PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
128 --AC_SUBST(PACKAGE_ICON_DIR)
129 --
130 --dnl Subst PACKAGE_HELP_DIR.
131 --NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
132 --AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
133 --PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
134 --AC_SUBST(PACKAGE_HELP_DIR)
135 --
136 --dnl Subst PACKAGE_MENU_DIR.
137 --NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
138 --AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
139 --PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
140 --AC_SUBST(PACKAGE_MENU_DIR)
141 --
142 --dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
143 --dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
144 --dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
145 --dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
146 --dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
147 --dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
148 --
149 --
150 --AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
151 --AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
152 --AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
153 --AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
154 --AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
155 --AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
156 --
157 --
158 - AC_CONFIG_FILES([
159 - Makefile
160 - po/Makefile.in
161 -@@ -254,4 +170,3 @@ icons/Makefile
162 - test/Makefile
163 - ])
164 - AC_OUTPUT
165 --
166 -diff --git a/icons/Makefile.am b/icons/Makefile.am
167 -index 9588562..0b17692 100644
168 ---- a/icons/Makefile.am
169 -+++ b/icons/Makefile.am
170 -@@ -4,7 +4,7 @@
171 - ## If you don't want it to overwrite it,
172 - ## Please disable it in the Anjuta project configuration
173 -
174 --lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
175 -+lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
176 -
177 - lingot_icons_DATA = \
178 - org.nongnu.lingot.svg
179 -From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
180 -From: Nicolas Boulenguez <nicolas.boulenguez@××××.fr>
181 -Date: Sat, 14 Jul 2018 09:07:52 +0200
182 -Subject: [PATCH] Stop generating the desktop file.
183 -
184 -Drop the absolute path, and allow the icon to be found dynamically.
185 -This makes adding bitmaps additionally to the SVG easier later as well.
186 ----
187 - configure.ac | 1 -
188 - org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
189 - 2 files changed, 1 insertion(+), 2 deletions(-)
190 - rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
191 -
192 -diff --git a/configure.ac b/configure.ac
193 -index 5f1ea03..08f208f 100644
194 ---- a/configure.ac
195 -+++ b/configure.ac
196 -@@ -252,7 +252,6 @@ po/Makefile.in
197 - src/Makefile
198 - icons/Makefile
199 - test/Makefile
200 --org.nongnu.lingot.desktop
201 - ])
202 - AC_OUTPUT
203 -
204 -diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
205 -similarity index 86%
206 -rename from org.nongnu.lingot.desktop.in
207 -rename to org.nongnu.lingot.desktop
208 -index 76842ce..8b3524f 100644
209 ---- a/org.nongnu.lingot.desktop.in
210 -+++ b/org.nongnu.lingot.desktop
211 -@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
212 - Comment[cs]=(Nejen kytarová) ladička
213 - Comment[fr]=Un accordeur de guitare, mais pas que
214 - Exec=lingot
215 --Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
216 -+Icon=org.nongnu.lingot.svg
217 - Terminal=false
218 - Type=Application
219 - Categories=GNOME;GTK;AudioVideo;
220 -From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
221 -From: Iban Cereijo <ibancg@××××××××××××××××××××.com>
222 -Date: Wed, 18 Jul 2018 13:59:25 +0200
223 -Subject: [PATCH] Putting the desktop file in the distributed files.
224 -
225 ----
226 - Makefile.am | 1 +
227 - 1 file changed, 1 insertion(+)
228 -
229 -diff --git a/Makefile.am b/Makefile.am
230 -index d61162f..d359df3 100644
231 ---- a/Makefile.am
232 -+++ b/Makefile.am
233 -@@ -10,7 +10,6 @@
234 - lingotdocdir = ${docdir}
235 - lingotdoc_DATA = \
236 - README \
237 -- COPYING \
238 - AUTHORS \
239 - ChangeLog \
240 - NEWS \
241 -@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
242 -
243 - EXTRA_DIST = \
244 - $(lingotdoc_DATA) \
245 -+ $(gnomemenu_DATA) \
246 - $(appdata_DATA) \
247 - build-aux/gitlog-to-changelog \
248 - bootstrap
249
250 diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.0.1.ebuild
251 deleted file mode 100644
252 index 523ec2ba532c..000000000000
253 --- a/media-sound/lingot/lingot-1.0.1.ebuild
254 +++ /dev/null
255 @@ -1,54 +0,0 @@
256 -# Copyright 1999-2018 Gentoo Authors
257 -# Distributed under the terms of the GNU General Public License v2
258 -
259 -EAPI=7
260 -
261 -inherit autotools
262 -
263 -DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
264 -HOMEPAGE="https://www.nongnu.org/lingot/"
265 -SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
266 -
267 -LICENSE="GPL-2"
268 -SLOT="0"
269 -KEYWORDS="~amd64 ~x86"
270 -IUSE="alsa +fftw jack pulseaudio"
271 -
272 -RDEPEND="
273 - dev-libs/glib:2
274 - x11-libs/cairo
275 - x11-libs/gdk-pixbuf:2
276 - x11-libs/gtk+:3
277 - alsa? ( media-libs/alsa-lib )
278 - fftw? ( sci-libs/fftw:3.0= )
279 - jack? ( virtual/jack )
280 - pulseaudio? ( media-sound/pulseaudio )
281 -"
282 -DEPEND="${RDEPEND}"
283 -BDEPEND="
284 - dev-util/intltool
285 - sys-devel/gettext
286 - virtual/pkgconfig
287 -"
288 -
289 -PATCHES=( "${FILESDIR}"/${P}-configure.patch )
290 -
291 -src_prepare() {
292 - default
293 - eautoreconf
294 -}
295 -
296 -src_configure() {
297 - local myemakeargs=(
298 - $(use_enable alsa)
299 - $(use_enable fftw libfftw)
300 - $(use_enable jack)
301 - $(use_enable pulseaudio)
302 - )
303 -
304 - econf "${myemakeargs[@]}"
305 -}
306 -
307 -src_install() {
308 - emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
309 -}