diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-18 10:11:00 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-18 10:11:00 +0000 |
commit | 6fbd87e731c2180ecd96a60a2430dabbf1704c73 (patch) | |
tree | a2007d7075c282ff0de44e85321e3285a17010d8 /sys-apps/dbus | |
parent | Version bump. Update optional tests patch. Weaken rails requirement to fix bu... (diff) | |
download | gentoo-2-6fbd87e731c2180ecd96a60a2430dabbf1704c73.tar.gz gentoo-2-6fbd87e731c2180ecd96a60a2430dabbf1704c73.tar.bz2 gentoo-2-6fbd87e731c2180ecd96a60a2430dabbf1704c73.zip |
Remove USE conditional for removing .la files as dbus ships functional pkg-config file. Remove annoying ebeep.
(Portage version: 2.2_rc83/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/dbus/dbus-1.4.0.ebuild | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 2804253d933d..8239da5e7d8b 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.260 2010/09/13 21:23:52 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.261 2010/09/18 10:11:00 ssuominen Exp $ + + 18 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.0.ebuild: + Remove USE conditional for removing .la files as dbus ships functional + pkg-config file. Remove annoying ebeep. 13 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> dbus-1.2.24-r2.ebuild, dbus-1.4.0.ebuild: diff --git a/sys-apps/dbus/dbus-1.4.0.ebuild b/sys-apps/dbus/dbus-1.4.0.ebuild index 5b65568754b9..15cd4e435f1e 100644 --- a/sys-apps/dbus/dbus-1.4.0.ebuild +++ b/sys-apps/dbus/dbus-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.2 2010/09/13 21:23:52 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.3 2010/09/18 10:11:00 ssuominen Exp $ EAPI="2" @@ -167,9 +167,7 @@ src_install() { fi # Remove .la files - if ! use static-libs; then - find "${D}" -type f -name '*.la' -exec rm -f {} + || die - fi + find "${D}" -type f -name '*.la' -exec rm -f '{}' + } pkg_postinst() { @@ -184,10 +182,10 @@ pkg_postinst() { ewarn "the new version of the daemon." if has_version "x11-base/xorg-server[hal]"; then - elog + ewarn ewarn "You are currently running X with the hal useflag enabled" ewarn "restarting the dbus service WILL restart X as well" - ebeep 5 + ewarn fi # Ensure unique id is generated |