diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2009-12-29 05:21:57 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2009-12-29 05:21:57 +0000 |
| commit | 60986ecebcef6b532c4c8d52455b5ccd95aedb50 (patch) | |
| tree | 1c21f02e52b4984e98f891b1a41132ced743e7c5 | |
| parent | Marked ppc stable for bug #284323. (diff) | |
| download | gentoo-2-60986ecebcef6b532c4c8d52455b5ccd95aedb50.tar.gz gentoo-2-60986ecebcef6b532c4c8d52455b5ccd95aedb50.tar.bz2 gentoo-2-60986ecebcef6b532c4c8d52455b5ccd95aedb50.zip | |
Fix building with USE=nls, bug 298207
(Portage version: 2.1.7.16/cvs/Linux x86_64)
| -rw-r--r-- | media-video/ushare/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ushare/ushare-1.1a.ebuild | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/media-video/ushare/ChangeLog b/media-video/ushare/ChangeLog index 2a41762e7ef5..2678d5deb42e 100644 --- a/media-video/ushare/ChangeLog +++ b/media-video/ushare/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ushare # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.1 2009/12/23 22:27:33 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.2 2009/12/29 05:21:57 darkside Exp $ + + 29 Dec 2009; Jeremy Olexa <darkside@gentoo.org> ushare-1.1a.ebuild: + Fix building with USE=nls, bug 298207 *ushare-1.1a (23 Dec 2009) diff --git a/media-video/ushare/ushare-1.1a.ebuild b/media-video/ushare/ushare-1.1a.ebuild index c25d54ec8c1c..09bdb947e036 100644 --- a/media-video/ushare/ushare-1.1a.ebuild +++ b/media-video/ushare/ushare-1.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.1 2009/12/23 22:27:33 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.2 2009/12/29 05:21:57 darkside Exp $ inherit eutils @@ -20,19 +20,17 @@ DEPEND="${RDEPEND} src_compile() { local myconf - # Configure need some tips - myconf="--prefix=/usr \ - $(use_enable dlna ) \ - $(use_enable nls ) \ - --disable-strip" + myconf="--prefix=/usr --disable-strip $(use_enable dlna)" + # nls can only be disabled, on by default. + use nls || myconf="${myconf} --disable-nls" # remove original init.d sed -i \ -e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \ -e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \ - scripts/Makefile + scripts/Makefile || die - # note: homegrown configure + # note: homegrown configure, careful. ./configure ${myconf} || die "Configure failed" emake || die "Make failed" |