Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/betagarden:master commit in: media-sound/slart/, media-sound/slart/files/
Date: Tue, 30 Jun 2015 21:38:22
Message-Id: 1435700286.9cf56cfee8e0eccffce8dc826892a830f5604074.sping@gentoo
1 commit: 9cf56cfee8e0eccffce8dc826892a830f5604074
2 Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
3 AuthorDate: Mon Jun 29 00:52:20 2015 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 21:38:06 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=9cf56cfe
7
8 media-sound/slart: 0.8.0.880
9
10 .../files/slart-0.8.0.880-exclude-stripped.patch | 23 ++++++++
11 .../slart/files/slart-0.8.0.880-linking.patch | 66 ++++++++++++++++++++++
12 .../slart/files/slart-0.8.0.880-unstripped.patch | 22 ++++++++
13 media-sound/slart/slart-0.8.0.880.ebuild | 43 ++++++++++++++
14 4 files changed, 154 insertions(+)
15
16 diff --git a/media-sound/slart/files/slart-0.8.0.880-exclude-stripped.patch b/media-sound/slart/files/slart-0.8.0.880-exclude-stripped.patch
17 new file mode 100644
18 index 0000000..7fff27e
19 --- /dev/null
20 +++ b/media-sound/slart/files/slart-0.8.0.880-exclude-stripped.patch
21 @@ -0,0 +1,23 @@
22 +From 6c2a170e94955bd391351af0f4cf2e4d97e9ae56 Mon Sep 17 00:00:00 2001
23 +From: Sebastian Pipping <sebastian@×××××××.org>
24 +Date: Mon, 29 Jun 2015 02:21:40 +0200
25 +Subject: [PATCH] Do not build tool "Stripped" (due to compile cdio paranoia
26 + compile errors)
27 +
28 +---
29 + src/apps/apps.pro | 1 -
30 + 1 file changed, 1 deletion(-)
31 +
32 +diff --git a/src/apps/apps.pro b/src/apps/apps.pro
33 +index 8057be1..8a97a44 100644
34 +--- a/src/apps/apps.pro
35 ++++ b/src/apps/apps.pro
36 +@@ -14,5 +14,4 @@ SUBDIRS += Notorious
37 + SUBDIRS += Partyman
38 + SUBDIRS += Rubberbandman
39 + SUBDIRS += Sorcerer
40 +-SUBDIRS += Stripped
41 +
42 +--
43 +2.4.0
44 +
45
46 diff --git a/media-sound/slart/files/slart-0.8.0.880-linking.patch b/media-sound/slart/files/slart-0.8.0.880-linking.patch
47 new file mode 100644
48 index 0000000..abcc578
49 --- /dev/null
50 +++ b/media-sound/slart/files/slart-0.8.0.880-linking.patch
51 @@ -0,0 +1,66 @@
52 +From 58acf6ca42ce9b82b166de63c45d634321ef48ce Mon Sep 17 00:00:00 2001
53 +From: Sebastian Pipping <sebastian@×××××××.org>
54 +Date: Mon, 29 Jun 2015 01:59:31 +0200
55 +Subject: [PATCH] Fix Qt linking errors
56 +
57 +---
58 + src/apps/Funkytown/Funkytown.pro | 2 +-
59 + src/apps/Innuendo/Innuendo.pro | 2 +-
60 + src/apps/Sorcerer/Sorcerer.pro | 1 +
61 + src/apps/Stripped/Stripped.pro | 2 +-
62 + 4 files changed, 4 insertions(+), 3 deletions(-)
63 +
64 +diff --git a/src/apps/Funkytown/Funkytown.pro b/src/apps/Funkytown/Funkytown.pro
65 +index 799b096..fc95b52 100644
66 +--- a/src/apps/Funkytown/Funkytown.pro
67 ++++ b/src/apps/Funkytown/Funkytown.pro
68 +@@ -6,7 +6,7 @@
69 +
70 + TARGET = Funkytown
71 + TEMPLATE = app
72 +-QT += network
73 ++QT += network sql
74 +
75 + include( ../../buildconfig.pri )
76 +
77 +diff --git a/src/apps/Innuendo/Innuendo.pro b/src/apps/Innuendo/Innuendo.pro
78 +index c5a939d..2badea3 100644
79 +--- a/src/apps/Innuendo/Innuendo.pro
80 ++++ b/src/apps/Innuendo/Innuendo.pro
81 +@@ -6,7 +6,7 @@
82 +
83 + TARGET = Innuendo
84 + TEMPLATE = app
85 +-QT += network
86 ++QT += network sql
87 +
88 + include( ../../buildconfig.pri )
89 +
90 +diff --git a/src/apps/Sorcerer/Sorcerer.pro b/src/apps/Sorcerer/Sorcerer.pro
91 +index ae0c6e8..a016c84 100644
92 +--- a/src/apps/Sorcerer/Sorcerer.pro
93 ++++ b/src/apps/Sorcerer/Sorcerer.pro
94 +@@ -6,6 +6,7 @@
95 +
96 + TARGET = Sorcerer
97 + TEMPLATE = app
98 ++QT += network sql
99 +
100 + include( ../../buildconfig.pri )
101 +
102 +diff --git a/src/apps/Stripped/Stripped.pro b/src/apps/Stripped/Stripped.pro
103 +index 4651b32..8faaae3 100644
104 +--- a/src/apps/Stripped/Stripped.pro
105 ++++ b/src/apps/Stripped/Stripped.pro
106 +@@ -6,7 +6,7 @@
107 +
108 + TEMPLATE = app
109 + TARGET = Stripped
110 +-QT += network
111 ++QT += network sql
112 + CONFIG += link_pkgconfig
113 +
114 + include( ../../buildconfig.pri )
115 +--
116 +2.4.0
117 +
118
119 diff --git a/media-sound/slart/files/slart-0.8.0.880-unstripped.patch b/media-sound/slart/files/slart-0.8.0.880-unstripped.patch
120 new file mode 100644
121 index 0000000..a94bc71
122 --- /dev/null
123 +++ b/media-sound/slart/files/slart-0.8.0.880-unstripped.patch
124 @@ -0,0 +1,22 @@
125 +From e7a0ce74cb94226f4a98e76f0b787886913085b1 Mon Sep 17 00:00:00 2001
126 +From: Sebastian Pipping <sebastian@×××××××.org>
127 +Date: Mon, 29 Jun 2015 02:26:40 +0200
128 +Subject: [PATCH] Stop stripping executables
129 +
130 +---
131 + Makefile | 2 --
132 + 1 file changed, 2 deletions(-)
133 +
134 +diff --git a/Makefile b/Makefile
135 +index 15a10b8..d615845 100644
136 +--- a/Makefile
137 ++++ b/Makefile
138 +@@ -32,5 +32,3 @@ install: release
139 + >>$(DESTDIR)$(PREFIX)/share/doc/slart/README.DerMixD.gz
140 + for f in $(DOCS); do \
141 + gzip -9 <docs/$$f >$(DESTDIR)$(PREFIX)/share/doc/slart/$$f.gz ; done
142 +- strip -R .note -R .comment $(DESTDIR)$(PREFIX)/bin/*
143 +- strip --strip-unneeded $(DESTDIR)$(PREFIX)/lib/*
144 +--
145 +2.4.0
146 +
147
148 diff --git a/media-sound/slart/slart-0.8.0.880.ebuild b/media-sound/slart/slart-0.8.0.880.ebuild
149 new file mode 100644
150 index 0000000..2115340
151 --- /dev/null
152 +++ b/media-sound/slart/slart-0.8.0.880.ebuild
153 @@ -0,0 +1,43 @@
154 +# Copyright 1999-2015 Gentoo Foundation
155 +# Distributed under the terms of the GNU General Public License v2
156 +# $Header: $
157 +
158 +EAPI="5"
159 +
160 +inherit versionator eutils
161 +
162 +MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4)"
163 +DESCRIPTION="Collection of audio tools (SvOlli's Little Audio Related Thingies)"
164 +HOMEPAGE="http://svolli.org/software/slart/"
165 +SRC_URI="http://svolli.org/download.php/software/slart/${PN}-${MY_PV}.tar.bz2"
166 +
167 +LICENSE="GPL-2 GPL-3" # require both since the code does not say which version
168 +SLOT="0"
169 +KEYWORDS="~amd64 ~x86"
170 +IUSE=""
171 +
172 +DEPEND="
173 + app-arch/bzip2
174 + app-misc/lirc
175 + dev-qt/qtcore
176 + dev-qt/qtgui
177 + dev-qt/qtsql
178 + media-libs/flac
179 + media-libs/libogg
180 + media-libs/libvorbis
181 + media-sound/lame
182 + sys-devel/gcc[cxx]
183 + "
184 +RDEPEND="${DEPEND}
185 + <media-sound/dermixd-2"
186 +
187 +S="${WORKDIR}"/${PN}-${MY_PV}
188 +
189 +src_prepare() {
190 + epatch "${FILESDIR}"/${P}-*.patch
191 +}
192 +
193 +src_install() {
194 + emake DESTDIR="${D}" PREFIX=/usr install || die
195 + rm "${D}"/usr/share/applications/slart-stripped.desktop || die
196 +}