summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-12-29 05:21:57 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-12-29 05:21:57 +0000
commitaf7bf52bd870a658fbe20712d15e853930bf239f (patch)
tree4e19478140873e8201f03d805397c54f73f78aee /media-video
parentMarked ppc stable for bug #284323. (diff)
downloadhistorical-af7bf52bd870a658fbe20712d15e853930bf239f.tar.gz
historical-af7bf52bd870a658fbe20712d15e853930bf239f.tar.bz2
historical-af7bf52bd870a658fbe20712d15e853930bf239f.zip
Fix building with USE=nls, bug 298207
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ushare/ChangeLog5
-rw-r--r--media-video/ushare/Manifest4
-rw-r--r--media-video/ushare/ushare-1.1a.ebuild14
3 files changed, 12 insertions, 11 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/Manifest b/media-video/ushare/Manifest
index 27abe70342ca..12f6e43b2b64 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -1,6 +1,6 @@
AUX ushare.conf.d 896 RMD160 8bf9d92633778a80a7492f8de120d03ca9d33a0d SHA1 d87f3bf5f813dc1a567d49c81809f57788b56036 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563
AUX ushare.init.d 2164 RMD160 adbee9c14af514ca8c91dfd0c9f37114828965ee SHA1 cde78bc810b58a2e1d7c2564750f38f81d325fb4 SHA256 7a8c4c06aacf9a87ae2036df24751a74a29e741a39e89e0c704c63a27ad2a4c2
DIST ushare-1.1a.tar.bz2 65864 RMD160 6194ffec031d20fd897f2c7cf71c3c810238713f SHA1 1539e83cde5d80f433d262d971f5fe78486c9375 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
-EBUILD ushare-1.1a.ebuild 1439 RMD160 0b4ff157ac5fc878582ad44ce4e1820e516e637a SHA1 6dba1bdc4bdcbf2cee872503aa3f05eefabe528a SHA256 138ea88146414e803c9c8f99bdb1709e92be6159b16cdc230e43707194599137
-MISC ChangeLog 499 RMD160 863ad71fb7d52a8727674f6759148035beef41c4 SHA1 de034bffd4160a15a233973268905feba2fa8914 SHA256 5a45a80bd9ccf59062d8cec61e26555f31e051e94dd77556b0a0934a8251249d
+EBUILD ushare-1.1a.ebuild 1484 RMD160 ad2822145045ee4cae54c2e78792265474e8ea18 SHA1 fd7b9444c95dfc5bfbd54626a22b3f77a70f70af SHA256 a03b18019162d3fad929c139c69465438bd8e5a9f2436713d07f6d5bf7ef84ba
+MISC ChangeLog 610 RMD160 62969eca5434acea74b94f9f7100405cab9ccb16 SHA1 7435dea800f3809c5386310195c46870ce0f8735 SHA256 e7ddbcc4af37bdb8ebc0226ca57fbffd911e8e620335f711925d643c8394d35f
MISC metadata.xml 317 RMD160 99f736c1280d43332906805dbef8b44ce79aba6e SHA1 240b0fc4e6b35df3d600b861507cd0053aebba01 SHA256 6e0c6717c1e0982384eb2b3c9357414f6e2476366ec0227b79718bb1444fa182
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"