1 |
commit: 7973ae7960b6cd0827dfe217c43e59cf1004bc84 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 8 16:43:23 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 8 16:43:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7973ae79 |
7 |
|
8 |
media-sound/mt-daapd: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../mt-daapd/files/mt-daapd-0.2.3-sparc.patch | 5 +- |
14 |
.../files/mt-daapd-0.2.4.1-libsorder.patch | 9 ++- |
15 |
.../mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch | 5 +- |
16 |
.../files/mt-daapd-0.2.4.2-maintainer-mode.patch | 4 +- |
17 |
.../files/mt-daapd-0.2.4.2-oggvorbis.patch | 4 +- |
18 |
media-sound/mt-daapd/files/mt-daapd.init.2 | 4 +- |
19 |
media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild | 69 ++++++++++++---------- |
20 |
7 files changed, 52 insertions(+), 48 deletions(-) |
21 |
|
22 |
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch |
23 |
index 482b25c1377..71d3009c8ac 100644 |
24 |
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch |
25 |
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch |
26 |
@@ -1,6 +1,5 @@ |
27 |
-diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c |
28 |
---- mt-daapd-0.2.3/src/mp3-scanner.c 2005-02-05 18:22:47.000000000 -0300 |
29 |
-+++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c 2006-01-03 16:39:50.000000000 -0300 |
30 |
+--- a/src/mp3-scanner.c |
31 |
++++ b/src/mp3-scanner.c |
32 |
@@ -1663,14 +1663,14 @@ |
33 |
/* now check for an XING header */ |
34 |
if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) { |
35 |
|
36 |
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch |
37 |
index a4c5a176ada..91d9e848c12 100644 |
38 |
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch |
39 |
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch |
40 |
@@ -1,6 +1,5 @@ |
41 |
-diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in |
42 |
---- mt-daapd-0.2.4.1.orig/configure.in 2007-10-22 02:50:24.000000000 +0300 |
43 |
-+++ mt-daapd-0.2.4.1/configure.in 2007-10-28 23:31:43.000000000 +0200 |
44 |
+--- a/configure.in |
45 |
++++ b/configure.in |
46 |
@@ -20,8 +20,9 @@ |
47 |
CPPFLAGS="${CPPFLAGS} -g" |
48 |
|
49 |
@@ -126,8 +125,8 @@ diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in |
50 |
fi |
51 |
fi |
52 |
diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am |
53 |
---- mt-daapd-0.2.4.1.orig/src/Makefile.am 2007-10-22 03:32:27.000000000 +0300 |
54 |
-+++ mt-daapd-0.2.4.1/src/Makefile.am 2007-10-28 23:31:33.000000000 +0200 |
55 |
+--- a/src/Makefile.am |
56 |
++++ b/src/Makefile.am |
57 |
@@ -34,6 +34,9 @@ |
58 |
redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \ |
59 |
$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC) |
60 |
|
61 |
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch |
62 |
index 5976316e5bf..71178f67811 100644 |
63 |
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch |
64 |
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch |
65 |
@@ -1,6 +1,5 @@ |
66 |
-diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c |
67 |
---- mt-daapd-0.2.4.1.orig/src/main.c 2007-10-22 02:27:57.000000000 +0300 |
68 |
-+++ mt-daapd-0.2.4.1/src/main.c 2007-10-28 23:54:29.000000000 +0200 |
69 |
+--- a/src/main.c |
70 |
++++ b/src/main.c |
71 |
@@ -551,6 +551,7 @@ |
72 |
printf(" -m Disable mDNS\n"); |
73 |
printf(" -c <file> Use configfile specified\n"); |
74 |
|
75 |
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch |
76 |
index a81483db6a1..7fc127fa695 100644 |
77 |
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch |
78 |
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch |
79 |
@@ -1,5 +1,5 @@ |
80 |
---- configure.in.orig 2008-07-06 23:57:08.000000000 +0200 |
81 |
-+++ configure.in 2008-07-06 23:57:46.000000000 +0200 |
82 |
+--- a/configure.in |
83 |
++++ b/configure.in |
84 |
@@ -17,10 +17,12 @@ |
85 |
rend_posix=true |
86 |
|
87 |
|
88 |
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch |
89 |
index 714f34142ac..b0352587a96 100644 |
90 |
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch |
91 |
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch |
92 |
@@ -1,5 +1,5 @@ |
93 |
---- configure.in.orig 2009-03-11 08:15:14.000000000 -0500 |
94 |
-+++ configure.in 2009-03-11 08:25:36.000000000 -0500 |
95 |
+--- a/configure.in |
96 |
++++ b/configure.in |
97 |
@@ -63,9 +63,14 @@ |
98 |
AC_SUBST(AVAHI_LIBS) |
99 |
|
100 |
|
101 |
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2 |
102 |
index eacc6ea7b7e..c77b7dd2bb5 100644 |
103 |
--- a/media-sound/mt-daapd/files/mt-daapd.init.2 |
104 |
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2 |
105 |
@@ -1,5 +1,5 @@ |
106 |
#!/sbin/openrc-run |
107 |
-# Copyright 1999-2017 Gentoo Foundation |
108 |
+# Copyright 1999-2019 Gentoo Authors |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
# Somehow based on init.d file shipped with mt-daapd itself. |
111 |
# |
112 |
@@ -26,7 +26,7 @@ fi |
113 |
|
114 |
depend() { |
115 |
need net |
116 |
- #USEHOWL need mDNSResponderPosix |
117 |
+ need avahi-daemon |
118 |
} |
119 |
|
120 |
start() { |
121 |
|
122 |
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild |
123 |
index a36e59993f8..572b7c21787 100644 |
124 |
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild |
125 |
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild |
126 |
@@ -1,11 +1,12 @@ |
127 |
-# Copyright 1999-2012 Gentoo Foundation |
128 |
+# Copyright 1999-2019 Gentoo Authors |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
|
131 |
-EAPI=2 |
132 |
-inherit autotools eutils |
133 |
+EAPI=7 |
134 |
+ |
135 |
+inherit autotools |
136 |
|
137 |
DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" |
138 |
-HOMEPAGE="http://www.mt-daapd.org" |
139 |
+HOMEPAGE="https://sourceforge.net/projects/mt-daapd/" |
140 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
141 |
|
142 |
LICENSE="GPL-2" |
143 |
@@ -13,63 +14,69 @@ SLOT="0" |
144 |
KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux" |
145 |
IUSE="vorbis" |
146 |
|
147 |
-RDEPEND="media-libs/libid3tag |
148 |
- sys-libs/gdbm |
149 |
- net-dns/avahi[dbus] |
150 |
- vorbis? ( media-libs/libvorbis )" |
151 |
+RDEPEND=" |
152 |
+ media-libs/libid3tag:= |
153 |
+ net-dns/avahi:=[dbus] |
154 |
+ sys-libs/gdbm:= |
155 |
+ sys-libs/zlib:= |
156 |
+ vorbis? ( |
157 |
+ media-libs/libvorbis:= |
158 |
+ media-libs/libogg:= |
159 |
+ )" |
160 |
DEPEND="${RDEPEND} |
161 |
virtual/pkgconfig" |
162 |
|
163 |
-src_prepare() { |
164 |
- cp "${FILESDIR}"/${PN}.init.2 initd |
165 |
- |
166 |
- sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd |
167 |
+PATCHES=( |
168 |
+ "${FILESDIR}"/${PN}-0.2.3-sparc.patch |
169 |
+ "${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch |
170 |
+ "${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch |
171 |
+ "${FILESDIR}"/${P}-maintainer-mode.patch |
172 |
+ "${FILESDIR}"/${P}-oggvorbis.patch |
173 |
+) |
174 |
|
175 |
- epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \ |
176 |
- "${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \ |
177 |
- "${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \ |
178 |
- "${FILESDIR}"/${P}-maintainer-mode.patch \ |
179 |
- "${FILESDIR}"/${P}-oggvorbis.patch |
180 |
+src_prepare() { |
181 |
+ default |
182 |
+ mv configure.{in,ac} || die |
183 |
eautoreconf |
184 |
} |
185 |
|
186 |
src_configure() { |
187 |
- econf $(use_enable vorbis oggvorbis) \ |
188 |
+ econf \ |
189 |
+ $(use_enable vorbis oggvorbis) \ |
190 |
--disable-maintainer-mode \ |
191 |
--enable-avahi \ |
192 |
--disable-mdns |
193 |
} |
194 |
|
195 |
src_install() { |
196 |
- emake DESTDIR="${D}" install || die "emake install failed." |
197 |
+ default |
198 |
|
199 |
insinto /etc |
200 |
newins contrib/mt-daapd.conf mt-daapd.conf.example |
201 |
doins contrib/mt-daapd.playlist |
202 |
|
203 |
- newinitd initd ${PN} |
204 |
+ newinitd "${FILESDIR}"/${PN}.init.2 ${PN} |
205 |
|
206 |
keepdir /var/cache/mt-daapd /etc/mt-daapd.d |
207 |
- dodoc AUTHORS ChangeLog CREDITS NEWS README TODO |
208 |
} |
209 |
|
210 |
pkg_postinst() { |
211 |
- einfo |
212 |
+ elog |
213 |
elog "You have to configure your mt-daapd.conf following" |
214 |
- elog "/etc/mt-daapd.conf.example file." |
215 |
- einfo |
216 |
+ elog "${EROOT}/etc/mt-daapd.conf.example file." |
217 |
+ elog |
218 |
|
219 |
if use vorbis; then |
220 |
- einfo |
221 |
- elog "You need to edit you extensions list in /etc/mt-daapd.conf" |
222 |
+ elog |
223 |
+ elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf" |
224 |
elog "if you want your mt-daapd to serve ogg files." |
225 |
- einfo |
226 |
+ elog |
227 |
fi |
228 |
|
229 |
- einfo |
230 |
+ elog |
231 |
elog "If you want to start more than one ${PN} service, symlink" |
232 |
- elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will" |
233 |
- elog "load the data from /etc/${PN}.d/<name>.conf." |
234 |
+ elog "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will" |
235 |
+ elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf." |
236 |
elog "Make sure that you have different cache directories for them." |
237 |
- einfo |
238 |
+ elog |
239 |
} |