summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-09-20 17:07:46 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-09-20 17:07:46 +0000
commit22c45015f28e494cac991535cd381baaf17d8acd (patch)
treea96e5918c5c91a21ef92b0df0472d2745dd5773b /sys-apps/dbus
parentVersion bump. (diff)
downloadhistorical-22c45015f28e494cac991535cd381baaf17d8acd.tar.gz
historical-22c45015f28e494cac991535cd381baaf17d8acd.tar.bz2
historical-22c45015f28e494cac991535cd381baaf17d8acd.zip
Remove pregenerated files from tarball wrt #337989 by Xake.
Package-Manager: portage-2.2_rc84/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog5
-rw-r--r--sys-apps/dbus/dbus-1.4.0.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 8239da5e7d8b..faf3b4a906e6 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
# 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.261 2010/09/18 10:11:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.262 2010/09/20 17:07:46 ssuominen Exp $
+
+ 20 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.0.ebuild:
+ Remove pregenerated files from tarball wrt #337989 by Xake.
18 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.0.ebuild:
Remove USE conditional for removing .la files as dbus ships functional
diff --git a/sys-apps/dbus/dbus-1.4.0.ebuild b/sys-apps/dbus/dbus-1.4.0.ebuild
index e3ea99092c72..f2fa7a806a88 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.4 2010/09/18 10:33:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.5 2010/09/20 17:07:46 ssuominen Exp $
EAPI="2"
@@ -49,12 +49,16 @@ pkg_setup() {
}
src_prepare() {
+ # Delete pregenerated files from tarball wrt #337989 (testsuite fails)
+ find test/data -type f -name '*.service' -exec rm -f '{}' +
+ find test/data -type f -name 'debug-*.conf' -exec rm -f '{}' +
+
# Remove CFLAGS that is not supported by all gcc, bug #274456
- sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed"
+ sed 's/-Wno-pointer-sign//g' -i configure.in configure || die
# Tests were restricted because of this
sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
- -e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die "sed failed"
+ -e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die
epatch "${FILESDIR}"/${P}-asneeded.patch