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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 3753bd58d408e7680cad0de4014cea6a3d186930..06fbda00c74f47fb212ed45c773a02d948486bf8 100644 (file)
--- 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/Manifest b/sys-apps/dbus/Manifest
index b0470c0cc7c2a1cc538cfd3de92cde8291841502..a73eda862ef8e05aa44dba05b9d87cffd5e35ada 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -9,9 +9,9 @@ DIST dbus-1.2.24.tar.gz 1673774 RMD160 2f51def784056bc16fbec2ddc3be22c022a94fb5
 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
 DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
-EBUILD dbus-1.2.24.ebuild 3876 RMD160 5f1a7cf20e6a524e75c309a5d98529e738e36357 SHA1 5aa0e7dd3cb997fb42c46c83b86555cd4cff7955 SHA256 30462262c272f5513ae8577a44637f7b70c77b3352af9b2e216d948b9d682550
+EBUILD dbus-1.2.24.ebuild 3775 RMD160 5d32a2de246688ffe1edc7c550982ce4eaedbfdf SHA1 d12c5fabe63be470497906d469611b0ff56239d7 SHA256 1163a165ff45d0ac4c7f7c71a94bfc18faff09cb9c9a6838526d45280a66ee9a
 EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
-EBUILD dbus-1.3.0-r1.ebuild 4829 RMD160 8962f2e34bfcd96f3ce004b1990df1fc0143ef76 SHA1 173474aa263caa03ddb8aa6cc791faa7dfd67a96 SHA256 3022f1452397cda6a917fb04dd2a9146e7054beb9e6e67ebc125b6a951d32c0f
+EBUILD dbus-1.3.0-r1.ebuild 4833 RMD160 a1493f67f372555bdde1a78570c1985d42ac56ea SHA1 89647ed284a754c1f7e9ae6898160a2500a63aee SHA256 cd23443c2bc782fd47db9b517144c07495ad6fc6a73852fe82033937a1a958a2
 EBUILD dbus-1.3.0.ebuild 4068 RMD160 89a06c41e86334f57a2256a0667e7f24083c2561 SHA1 b0a9eb87b19d9998f1732880e8e2626ad0d57f5b SHA256 38a01cdf9aa19e527e9cfc0917f60b38d2a3b6615e16c25b5d15755cc4b99e94
-MISC ChangeLog 37897 RMD160 d2df80800cedd0f2ca7ebf8794d774c6df150636 SHA1 aa075ab63da83622a62176cd66fb0548c0329380 SHA256 1d54e0cec70f9996e56838db3d729c2e25173bd67db65a7093a842fd3f86cf3e
+MISC ChangeLog 38102 RMD160 c2c49680d09e17b5b1c9eefa75f0bc0892c65743 SHA1 80545a2358778902da096ff54df68685fc4bf79d SHA256 e7a7bb5cb21fb9ad52c09005d07d3841893ba0f53180507773d6203c6f5f702d
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82

diff --git a/sys-apps/dbus/dbus-1.2.24.ebuild b/sys-apps/dbus/dbus-1.2.24.ebuild
index 9923dfa14cf9ec7a513a54803d7f72845edae363..9ff43296cc721820bcadbb581bdfe9a11700f743 100644 (file)
--- 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 ddada2066116449a2159bb786a6b4296f3ffcdd2..dfd33cb003d3be8179c00e2d7f280ca36d8e90ab 100644 (file)
--- 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 :"