1 |
darkside 09/12/29 05:21:57 |
2 |
|
3 |
Modified: ChangeLog ushare-1.1a.ebuild |
4 |
Log: |
5 |
Fix building with USE=nls, bug 298207 |
6 |
(Portage version: 2.1.7.16/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 media-video/ushare/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ChangeLog?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ChangeLog?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ChangeLog?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- ChangeLog 23 Dec 2009 22:27:33 -0000 1.1 |
22 |
+++ ChangeLog 29 Dec 2009 05:21:57 -0000 1.2 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for media-video/ushare |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.1 2009/12/23 22:27:33 darkside Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.2 2009/12/29 05:21:57 darkside Exp $ |
28 |
+ |
29 |
+ 29 Dec 2009; Jeremy Olexa <darkside@g.o> ushare-1.1a.ebuild: |
30 |
+ Fix building with USE=nls, bug 298207 |
31 |
|
32 |
*ushare-1.1a (23 Dec 2009) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 media-video/ushare/ushare-1.1a.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: ushare-1.1a.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- ushare-1.1a.ebuild 23 Dec 2009 22:27:33 -0000 1.1 |
50 |
+++ ushare-1.1a.ebuild 29 Dec 2009 05:21:57 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2009 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.1 2009/12/23 22:27:33 darkside Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.2 2009/12/29 05:21:57 darkside Exp $ |
56 |
|
57 |
inherit eutils |
58 |
|
59 |
@@ -20,19 +20,17 @@ |
60 |
|
61 |
src_compile() { |
62 |
local myconf |
63 |
- # Configure need some tips |
64 |
- myconf="--prefix=/usr \ |
65 |
- $(use_enable dlna ) \ |
66 |
- $(use_enable nls ) \ |
67 |
- --disable-strip" |
68 |
+ myconf="--prefix=/usr --disable-strip $(use_enable dlna)" |
69 |
+ # nls can only be disabled, on by default. |
70 |
+ use nls || myconf="${myconf} --disable-nls" |
71 |
|
72 |
# remove original init.d |
73 |
sed -i \ |
74 |
-e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \ |
75 |
-e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \ |
76 |
- scripts/Makefile |
77 |
+ scripts/Makefile || die |
78 |
|
79 |
- # note: homegrown configure |
80 |
+ # note: homegrown configure, careful. |
81 |
./configure ${myconf} || die "Configure failed" |
82 |
|
83 |
emake || die "Make failed" |