ppc64 stable, punt old

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 13 insertions, 209 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index cc6766940f0b..8d84d40127d7 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.284 2011/04/23 16:44:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.285 2011/04/23 16:56:32 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.6.ebuild:
+  ppc64 stable wrt #360769
 
   23 Apr 2011; Raúl Porcel <armin76@gentoo.org> dbus-1.4.6.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #360769
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index fa1b15f1a817..6a951b776184 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
 AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
-DIST dbus-1.4.1.tar.gz 1850139 RMD160 090740469872b31c24aafb4e4d40e690184b1580 SHA1 112279ff58305027294fe0eb5bee600f68cf0b50 SHA256 caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd
 DIST dbus-1.4.6.tar.gz 1835214 RMD160 c751630654225b729512d7a996e5ad70dbfc59fc SHA1 e87520518dfa0bfc4b8791105673e48f993874d7 SHA256 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
 DIST dbus-1.4.8.tar.gz 1841864 RMD160 3f0f7ff7e952b93c33fe27862d2b4191394e0032 SHA1 68076715cc600964967715fff927face01313b6e SHA256 48bf73a35be0f0e2d9a5071d8f2d9c7c40b4254d9b405dee57f0fb07c9c3cf58
-EBUILD dbus-1.4.1.ebuild 5229 RMD160 db7f4d6d43d580057968abc4ea37977411c6403b SHA1 3ef8c357182389eb892d1f16ab6c041456a78910 SHA256 5c2b8b8a1d9bd2b59a935001636104be10c5da3f71881937359ea42f746df927
-EBUILD dbus-1.4.6.ebuild 4671 RMD160 b7fc4570b96fbaae32ce0264f10404c7d9d64583 SHA1 328b6713bba4a32d6a4436baa03e03366940a9f8 SHA256 d54fe8dad6c789164323336668d9f7fd3ea79ea9f76f409dfaa6e1dcf98cf553
+EBUILD dbus-1.4.6.ebuild 4672 RMD160 bf4985c13160d74929a42ee11fc00ca7b9a355c6 SHA1 640c6ace3c712307c540bf5ba371736f805ecf57 SHA256 88b4b014c7618ae2369ff350886c83249a597fe2c3ce85b7dfded590da3df948
 EBUILD dbus-1.4.8.ebuild 4716 RMD160 9b33c9b6341b405e920032e7dda0d910445c80bf SHA1 357e898dfb2028f1c87fa02fc9dccee35be2601f SHA256 43259b5c228f762ee3a23ad572f9b49635f4a7bab1da2db310fcc45e56609648
-MISC ChangeLog 42970 RMD160 f898b439bfece931fa5759a90f679bb177268d98 SHA1 74a96aa59cc318dd8b43da3ce89f9155051c7684 SHA256 10a9aa8e53ace2a732cf0b244729f1f90c21b43243cc653e6340f5f3c13fdd8f
+MISC ChangeLog 43073 RMD160 12a111ecce6c39d64a2b63c81940d6d305db22de SHA1 834a67f367278e004a744b10dd086cfb079580d0 SHA256 e388ea0f479cff7b0ea43358147daa7fd6ab0ecdc2fbee3d7ba7c510e2489a4f
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2zAeAACgkQuQc30/atMkCChwCdHAmuivZj19lRzmjUhTVHDfmv
-QAYAoIC8j5ndUn4leXhd8fGwW6EsCivX
-=harW
+iF4EAREIAAYFAk2zBQgACgkQXkR9YqOcLPGRIQEAlhLdJOps59pEXU+oNXhNbwys
+RWELo8hpmH5u+IcvQMMA/A1d7P+zSKfVbec8pORDYsUCHxIg0W7L4wdZYhZMlarb
+=Npw2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.1.ebuild b/sys-apps/dbus/dbus-1.4.1.ebuild
deleted file mode 100644
index 689a0094cfbb..000000000000
--- a/sys-apps/dbus/dbus-1.4.1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.1.ebuild,v 1.10 2011/03/03 00:31:42 arfrever Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib flag-o-matic python virtualx
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="http://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc selinux static-libs test X"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-dbus
-	)
-"
-RDEPEND="${CDEPEND}
-	!<sys-apps/dbus-0.91
-	>=dev-libs/expat-1.95.8
-"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	)
-	test? ( =dev-lang/python-2* )
-"
-
-# out of sources build directory
-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
-
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-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
-
-	# 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
-
-	epatch "${FILESDIR}"/${PN}-1.4.0-asneeded.patch
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	my_conf="$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		$(use_enable static-libs static)
-		--enable-shared
-		--with-xml=expat
-		--with-system-pid-file=/var/run/dbus.pid
-		--with-system-socket=/var/run/dbus/system_bus_socket
-		--with-session-socket-dir=/tmp
-		--with-dbus-user=messagebus
-		--localstatedir=/var"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc xml-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts)
-	fi
-}
-
-src_compile() {
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die "make failed"
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xmake check || die "make check failed"
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die "newinitd failed"
-
-	if use X ; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/80-dbus || die "doexe failed"
-	fi
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-	# needs to exist for machine id
-	keepdir /var/lib/dbus
-	# needs to exist for dbus sessions to launch
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die "dodoc failed"
-
-	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml -p api/ doc/api/html/* || die "dohtml api failed"
-		cd "${S}"
-		dohtml doc/*.html || die "dohtml failed"
-	fi
-
-	# Remove .la files
-	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	elog "To start the D-Bus system-wide messagebus by default"
-	elog "you should add it to the default runlevel :"
-	elog "\`rc-update add dbus default\`"
-	elog
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon."
-	ewarn "Don't do this while X is running because it will restart your X as well."
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/dbus-1.4.6.ebuild b/sys-apps/dbus/dbus-1.4.6.ebuild
index 49c4684df8a2..10f2a8fb1324 100644
--- a/sys-apps/dbus/dbus-1.4.6.ebuild
+++ b/sys-apps/dbus/dbus-1.4.6.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-apps/dbus/dbus-1.4.6.ebuild,v 1.8 2011/04/23 16:44:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.6.ebuild,v 1.9 2011/04/23 16:56:32 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib flag-o-matic python virtualx
@@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc selinux static-libs test X"
 
 CDEPEND="