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
commit06f9b539f50a980bacc9bbd17b315575221ca2d7 (patch)
tree8a9b18e43b3f1c8478e71086f46422cd7550500f /sys-libs
parentRevision bump to fix two issues with the init script reported by Alexander Y.... (diff)
downloadhistorical-06f9b539f50a980bacc9bbd17b315575221ca2d7.tar.gz
historical-06f9b539f50a980bacc9bbd17b315575221ca2d7.tar.bz2
historical-06f9b539f50a980bacc9bbd17b315575221ca2d7.zip
Fix build when USE=-dbus.
Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libnih/ChangeLog5
-rw-r--r--sys-libs/libnih/Manifest10
-rw-r--r--sys-libs/libnih/libnih-1.0.3.ebuild6
3 files changed, 12 insertions, 9 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/Manifest b/sys-libs/libnih/Manifest
index dc64bd5030ea..faa7cffbe202 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
AUX libnih-1.0.3-optional-dbus.patch 1162 RMD160 471beafeaeeb7fdd7289065ff4d90f6b5920b54a SHA1 9b4746fd48df7cccb4d815bf3270d5b95412fd84 SHA256 93e81914a402ebc512c7df46e00f85b54ed073a66fcf9fe465cb58d757546abf
AUX libnih-1.0.3-pkg-config.patch 2491 RMD160 c9d91e0ee30aa424c3a4e606a4f578e1e820efc8 SHA1 97546652dcda14ee8f251ec9fa7f98a2f319af40 SHA256 cefe32c74c2c23f991e78bb8eaf97da8bcd1b4f252c1aed334e75027568f24d7
DIST libnih-1.0.3.tar.gz 1187624 RMD160 954df698ae272b5f9a30e191bf3deb382bd92d51 SHA1 db1f3e46a47f8a58f8179ca56f304d1550f41eb0 SHA256 897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405
-EBUILD libnih-1.0.3.ebuild 1254 RMD160 b7596beb9961cd39cbac8d93bbe1836fca354c69 SHA1 8ae70645855f27c764765b291b9e2acde5a7dea2 SHA256 86342ac1a27643ad1ede2d183ac846135aaa74595654bc481ecf27f4180a469e
-MISC ChangeLog 499 RMD160 a8b940c7932c365f8482b32c5e3cf2dcf764b64d SHA1 d04257e6bc63ec83ef2996562e138bfed5c42243 SHA256 8aa870898d82a9d26a4cabcb49a956d870b744574538926e02ebf5fc34d8f6e7
+EBUILD libnih-1.0.3.ebuild 1275 RMD160 c0e751d26ded9060a551f4d74b63ebfd2ae5286e SHA1 0bc5706245cc98e71cfa8c3624987285e2aaa55b SHA256 2a90f5b565e6d83bd8f340338eafe59ad183f9f9b0d1bec643cd82473cdc19aa
+MISC ChangeLog 599 RMD160 489e320c3b58c9eee58e75ea5b49a36c323d439f SHA1 7b3eccdeaa53a83e5b2fb0f28c5236c7c3a621ff SHA256 ba4af46960c28bca8d8b957b730e44ea19f12991eb08a90bd89dc071985cf9f0
MISC metadata.xml 265 RMD160 d04c394332d55908cd27a1be72252bbc428fa014 SHA1 afbd8e2ed78b9b047b5964c3ab8fc9325a9c4a90 SHA256 392f5b2c28e89d50960bbd5320bae373a5a33f162ed4ecec8088696aad5d61f2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6fCG0ACgkQaC/OocHi7JYKOgD7BRHLDP4pHUCqxOArS6jLjGOQ
-mf/ao69XY9ssOwB301sA/3JiQQO6nVNKQZs8v0JMHZEcLsYEeG/MdzwpOg5644n1
-=T2RX
+iF4EAREIAAYFAk6fDmQACgkQaC/OocHi7JYcRgD+OXrrGIal81XXDLnWEuzQdtO7
+CE+17Anyy3ZibsMRvCYBAJh9SqWTxWhgOqExlnJn1f5J8RYTUyBWTC+VcWoGCc1B
+=LZOu
-----END PGP SIGNATURE-----
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