summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-19 17:52:29 +0000
committerMike Frysinger <vapier@gentoo.org>2011-10-19 17:52:29 +0000
commit5f13419317313953551dabd2f3656cda9b3d5eda (patch)
tree3b1218dd894c81db02167cd34cd1a1f72a5eee3d /sys-libs/libnih
parentRevision bump to fix two issues with the init script reported by Alexander Y.... (diff)
downloadgentoo-2-5f13419317313953551dabd2f3656cda9b3d5eda.tar.gz
gentoo-2-5f13419317313953551dabd2f3656cda9b3d5eda.tar.bz2
gentoo-2-5f13419317313953551dabd2f3656cda9b3d5eda.zip
Fix build when USE=-dbus.
(Portage version: 2.2.0_alpha65/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/libnih')
-rw-r--r--sys-libs/libnih/ChangeLog5
-rw-r--r--sys-libs/libnih/libnih-1.0.3.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-libs/libnih/ChangeLog b/sys-libs/libnih/ChangeLog
index b6c55cbfed94..d407391bb13e 100644
--- a/sys-libs/libnih/ChangeLog
+++ b/sys-libs/libnih/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libnih
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/ChangeLog,v 1.1 2011/10/19 17:27:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/ChangeLog,v 1.2 2011/10/19 17:52:29 vapier Exp $
+
+ 19 Oct 2011; Mike Frysinger <vapier@gentoo.org> libnih-1.0.3.ebuild:
+ Fix build when USE=-dbus.
*libnih-1.0.3 (19 Oct 2011)
diff --git a/sys-libs/libnih/libnih-1.0.3.ebuild b/sys-libs/libnih/libnih-1.0.3.ebuild
index 934331c7a09a..24e4a00579a6 100644
--- a/sys-libs/libnih/libnih-1.0.3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/libnih-1.0.3.ebuild,v 1.1 2011/10/19 17:27:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/libnih-1.0.3.ebuild,v 1.2 2011/10/19 17:52:29 vapier Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+do
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus nls static-libs test +threads"
+IUSE="+dbus nls static-libs test +threads"
RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ src_install() {
emake DESTDIR="${D}" install || die
# we need to be in / because upstart needs libnih
- gen_usr_ldscript -a nih nih-dbus
+ gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
use static-libs || rm "${D}"/usr/lib*/*.la
dodoc AUTHORS ChangeLog HACKING NEWS README TODO