Don't unpack() in src_prepare and create messagebus user in pkg_setup() wrt #222551 by Tim Yamin.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 22 insertions, 22 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 3753bd58d408..06fbda00c74f 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.246 2010/03/25 17:21:59 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.247 2010/03/26 09:41:28 ssuominen Exp $
+
+  26 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dbus-1.2.24.ebuild,
+  dbus-1.3.0-r1.ebuild:
+  Don't unpack() in src_prepare and create messagebus user in pkg_setup()
+  wrt #222551 by Tim Yamin.
 
 *dbus-1.2.24 (25 Mar 2010)
 
diff --git a/sys-apps/dbus/dbus-1.2.24.ebuild b/sys-apps/dbus/dbus-1.2.24.ebuild
index 9923dfa14cf9..9ff43296cc72 100644
--- a/sys-apps/dbus/dbus-1.2.24.ebuild
+++ b/sys-apps/dbus/dbus-1.2.24.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.2.24.ebuild,v 1.1 2010/03/25 17:21:59 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24.ebuild,v 1.2 2010/03/26 09:41:27 ssuominen Exp $
 
 EAPI=2
 
@@ -25,15 +25,15 @@ DEPEND="${RDEPEND}
 	doc? (	app-doc/doxygen
 		app-text/xmlto )"
 
-src_prepare() {
-		enewgroup messagebus
-	    enewuser messagebus -1 "-1" -1 messagebus
-		unpack ${A}
-		cd "${S}"
-		# 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"
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 "-1" -1 messagebus
+}
 
+src_prepare() {
+	# 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"
 }
 
 src_configure() {
@@ -102,11 +102,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
 pkg_postinst() {
 	elog "To start the D-Bus system-wide messagebus by default"
 	elog "you should add it to the default runlevel :"
diff --git a/sys-apps/dbus/dbus-1.3.0-r1.ebuild b/sys-apps/dbus/dbus-1.3.0-r1.ebuild
index ddada2066116..dfd33cb003d3 100644
--- a/sys-apps/dbus/dbus-1.3.0-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.0-r1.ebuild,v 1.3 2009/11/23 21:27:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r1.ebuild,v 1.4 2010/03/26 09:41:28 ssuominen Exp $
 
 EAPI="2"
 
@@ -32,6 +32,11 @@ BD=${WORKDIR}/${P}-build
 # out of sources build dir for make check
 TBD=${WORKDIR}/${P}-tests-build
 
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 "-1" -1 messagebus
+}
+
 src_prepare() {
 	# Remove CFLAGS that is not supported by all gcc, bug #274456
 	sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed"
@@ -143,11 +148,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
 pkg_postinst() {
 	elog "To start the D-Bus system-wide messagebus by default"
 	elog "you should add it to the default runlevel :"