Switching to expat from libxml2 since now libxml2 suffers from bitrot instead of expat. Removed old version.

Package-Manager: portage-2.1.2_pre1

3 files changed, 21 insertions, 174 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index c67b982f1b2a..fd5dc04a830f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
@@ -99,7 +102,6 @@ MD5 791bda1b16e54eba80a07d873dc97763 files/dbus.init-0.61 1377
 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 files/dbus.init-0.61 1377
 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4 files/dbus.init-0.61 1377
 DIST dbus-0.23.4.tar.gz 1288374 RMD160 94c6ed261cbf41695b7cc15c99ef929868f8645d SHA1 57ea3dd1a0ef520b1f891932e7ccd6b8d59eaca9 SHA256 44caee8d5fb3293c22def4d58a6a85e52786e1eb0f89a339b16e6d50773fd3a1
-DIST dbus-0.50.tar.gz 1610305 RMD160 a80be17d1c117a7c218bf3a78d0a8fbae134bd91 SHA1 cca89dc471ca7ca830cd6378638c3a2ec78dc16a SHA256 3a8375c935f0c7b87cdd25f0408da963836fdce23390bb1b81cc6bd6ee7951c5
 DIST dbus-0.60.tar.gz 1674899 RMD160 035e0de53c2917b6e4b53a43026191d6de39a5f7 SHA1 23de2bd60e5df1c83c0778969faa36f98b93a3b2 SHA256 32ff1b1c7388cd2bfd4a23d4b9f460b2265579f1e097f0d4c0261c7e00adf8a8
 DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec
 DIST dbus-0.62.tar.gz 1737361 RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 SHA1 45acea9bd19902791c6dbd8620256caf9d74a667 SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
@@ -107,10 +109,6 @@ EBUILD dbus-0.23.4-r1.ebuild 3647 RMD160 95a90304034310aca17332de2630eafb42fc902
 MD5 0a3ccb0284a0af4926f526876d1ef0b5 dbus-0.23.4-r1.ebuild 3647
 RMD160 95a90304034310aca17332de2630eafb42fc9023 dbus-0.23.4-r1.ebuild 3647
 SHA256 7d731c80718f0f31d5726a7d6dd4bfcd632634e6d9d08cc6044a46d4b1028846 dbus-0.23.4-r1.ebuild 3647
-EBUILD dbus-0.50-r2.ebuild 4337 RMD160 801e0e322ebe74e068214ea145172cce080bcaed SHA1 bd2fe9f80f074d071ada64fbdd9991a8486f4363 SHA256 d451237745b49c8b8831cd0be011b092888f10bf54b06b415c27c1fea4fb9ae5
-MD5 4625c90c473b3c2d9373849e21d20d6e dbus-0.50-r2.ebuild 4337
-RMD160 801e0e322ebe74e068214ea145172cce080bcaed dbus-0.50-r2.ebuild 4337
-SHA256 d451237745b49c8b8831cd0be011b092888f10bf54b06b415c27c1fea4fb9ae5 dbus-0.50-r2.ebuild 4337
 EBUILD dbus-0.60-r4.ebuild 4624 RMD160 bf4e1bf04a8af18ed6e59ba6b42dfd03460f310a SHA1 7d9ea311320ba561d8a3006fca3d8068f06b68c2 SHA256 3013a95dc43dbf983d6a550f87895a4274f15ab9f6e8f064df40a44f4c78dbcf
 MD5 72538d61dc3152294360353e486994da dbus-0.60-r4.ebuild 4624
 RMD160 bf4e1bf04a8af18ed6e59ba6b42dfd03460f310a dbus-0.60-r4.ebuild 4624
@@ -119,6 +117,10 @@ EBUILD dbus-0.61-r1.ebuild 4176 RMD160 057af2e7525f3790141c699ccd24d50762ee0ae2
 MD5 bda8d8d420215a8701b4e95d7593000a dbus-0.61-r1.ebuild 4176
 RMD160 057af2e7525f3790141c699ccd24d50762ee0ae2 dbus-0.61-r1.ebuild 4176
 SHA256 27931a28f6a6cf20710346ec0bbf2ad572da30fddd3f4b75dbd801eb85552bdf dbus-0.61-r1.ebuild 4176
+EBUILD dbus-0.62-r1.ebuild 4025 RMD160 938479b0648339cb3af12a8c65d2606e546da433 SHA1 907094de2294eb8ab8a9cf417fefaa3def7a54c3 SHA256 f19bfb41b004f9bc509a28609c0fff95ebcfedcdca4e24717c20e00bd6305f31
+MD5 ac33e861de6ead95ab2c354c1c2e19d2 dbus-0.62-r1.ebuild 4025
+RMD160 938479b0648339cb3af12a8c65d2606e546da433 dbus-0.62-r1.ebuild 4025
+SHA256 f19bfb41b004f9bc509a28609c0fff95ebcfedcdca4e24717c20e00bd6305f31 dbus-0.62-r1.ebuild 4025
 EBUILD dbus-0.62.ebuild 3928 RMD160 83427bb1dd99c54604ef24b665e3670a477d5721 SHA1 510c2105a49c026128e6120893fe3429dbfc73f7 SHA256 fc6ca85f55a33430f7cbd9d2035507f2f679dcb82646f0c1e58d1f7b608c73f7
 MD5 4620a2548314dee2714ad57670e70115 dbus-0.62.ebuild 3928
 RMD160 83427bb1dd99c54604ef24b665e3670a477d5721 dbus-0.62.ebuild 3928
@@ -127,10 +129,10 @@ EBUILD dbus-0.91.ebuild 1155 RMD160 ef0f229135f4b33bd0559c2ba7e5079b6519c254 SHA
 MD5 69ee483e2494027f64173ca0cf4599d9 dbus-0.91.ebuild 1155
 RMD160 ef0f229135f4b33bd0559c2ba7e5079b6519c254 dbus-0.91.ebuild 1155
 SHA256 ba6df9ac1ae059257bec91ac8f00c9f74179fa72600a095e1f03054430507ef7 dbus-0.91.ebuild 1155
-MISC ChangeLog 19150 RMD160 6b15027ac7fe177c12d26d363bc7db238a7855c4 SHA1 19976414a58540e540629f92fe34f39887e87441 SHA256 edce7d2af932deeea0a7a0f194ee86df434551d7086fda6aa9092b6c37b4923a
-MD5 8d5f4a48eb62a841c410706ae55c79a1 ChangeLog 19150
-RMD160 6b15027ac7fe177c12d26d363bc7db238a7855c4 ChangeLog 19150
-SHA256 edce7d2af932deeea0a7a0f194ee86df434551d7086fda6aa9092b6c37b4923a ChangeLog 19150
+MISC ChangeLog 19392 RMD160 82c475d8b523430323cf08f98e0c3b550bef9f87 SHA1 e12859a488543b8e88c429a08b11135875c6ab28 SHA256 34add3cd76c6e028a2f75ec5ee4233b7c076406e6a8ad067d407015efe2722a0
+MD5 505ec8d76fbd8b8dd8fd7d5de8c01c55 ChangeLog 19392
+RMD160 82c475d8b523430323cf08f98e0c3b550bef9f87 ChangeLog 19392
+SHA256 34add3cd76c6e028a2f75ec5ee4233b7c076406e6a8ad067d407015efe2722a0 ChangeLog 19392
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -138,9 +140,6 @@ SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata
 MD5 fe774599e1fe277a51fb9501779c9cbd files/digest-dbus-0.23.4-r1 238
 RMD160 175d1cdf3759345407ae76b8faf3291acb0aae59 files/digest-dbus-0.23.4-r1 238
 SHA256 b156d78074cac957a5673f13b0729dc2e39dacaecb16dbeb958aa2c71d5b166e files/digest-dbus-0.23.4-r1 238
-MD5 5fda3e1004a2251586f26dc95285f753 files/digest-dbus-0.50-r2 232
-RMD160 09f14dbae7932f8d5f1fdb462d9247e0bd259226 files/digest-dbus-0.50-r2 232
-SHA256 8345f67a70239e43d7b9dc8dacd17d1ef787a80f6a76dae10932f1c5a759b782 files/digest-dbus-0.50-r2 232
 MD5 a25549d1b0910ed13259d874259d7999 files/digest-dbus-0.60-r4 232
 RMD160 610b7c232ca7c6cfeb743b60e7fd4a20b1989113 files/digest-dbus-0.60-r4 232
 SHA256 36a3bbab5e321662fa0ad82c00e537aef0bc4f542c97547a5059f0fe1b5098b3 files/digest-dbus-0.60-r4 232
@@ -150,6 +149,16 @@ SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/di
 MD5 e00700223b4c2566d3c5b60371b524ff files/digest-dbus-0.62 232
 RMD160 020d50c35dbd8578464f56119db955bfb811d61c files/digest-dbus-0.62 232
 SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/digest-dbus-0.62 232
+MD5 e00700223b4c2566d3c5b60371b524ff files/digest-dbus-0.62-r1 232
+RMD160 020d50c35dbd8578464f56119db955bfb811d61c files/digest-dbus-0.62-r1 232
+SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/digest-dbus-0.62-r1 232
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-dbus-0.91 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-dbus-0.91 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-dbus-0.91 1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFEx8PoeSe8B0zEfwRAs8vAJ9jqebfH7e63+rM9cJr8o44F7rt3QCfQM8U
+NsTUexWbEje3qA9oUwCCXLY=
+=8qwD
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.50-r2.ebuild b/sys-apps/dbus/dbus-0.50-r2.ebuild
deleted file mode 100644
index 11e56623406a..000000000000
--- a/sys-apps/dbus/dbus-0.50-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r2.ebuild,v 1.8 2006/06/24 15:04:23 cardoe Exp $
-
-inherit eutils mono python multilib autotools debug qt3
-
-IUSE="X gtk qt3 python mono doc xml"
-# gcj - this still doesnt work properly
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
-HOMEPAGE="http://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	xml? ( >=dev-libs/libxml2-2.6.21 )
-	!xml? ( dev-libs/expat )
-	X? ( || (
-		(
-		x11-libs/libXt
-		x11-libs/libX11
-		)
-	virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2.6 )
-	python? ( >=dev-lang/python-2.4
-		>=dev-python/pyrex-0.9.3-r2 )
-	qt3? ( $(qt_min_version 3.3) )
-	mono? ( >=dev-lang/mono-0.95 )"
-
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen
-		app-text/xmlto )
-	doc? ( mono? ( >=dev-util/monodoc-1.1.9
-				   >=dev-util/mono-tools-1.1.9 ) )"
-
-pkg_setup() {
-#	if use gcj && ! built_with_use sys-devel/gcc gcj; then
-#		eerror "To build the Java bindings for dbus, you must re-build gcc"
-#		eerror "with the 'gcj' USE flag. Add 'gcj' to USE and re-emerge gcc."
-#		die "gcc needs gcj support to use the java bindings"
-#	fi
-
-	PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#add missing include (#78617)
-	epatch ${FILESDIR}/${PN}-0.23-fd_set.patch
-	# Fix dnotify support
-	epatch ${FILESDIR}/${PN}-dnotify_configure-01.diff
-	epatch ${FILESDIR}/${PN}-dnotify_watchdirs-01.diff
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	# Choose which xml library to use
-	if use xml; then
-		myconf="${myconf} --with-xml=libxml"
-	else
-		myconf="${myconf} --with-xml=expat"
-	fi
-
-	# Only enable mono-docs if both mono and doc is defined
-	use mono && myconf="${myconf} `use_enable doc mono-docs`"
-
-	if use qt3; then
-		myconf="${myconf} --enable-qt=${QTDIR} QT_MOC=${QTDIR}/bin/moc"
-	else
-		myconf="${myconf} --disable-qt"
-	fi
-
-	# NOTE: I have disabled the xml docs because they are rather pointless
-	econf \
-		$(use_with X x) \
-		$(use_enable gtk) \
-		$(use_enable python) \
-		$(use_enable mono) \
-		$(use_enable kernel_linux dnotify) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug checks) \
-		$(use_enable debug asserts) \
-		--enable-glib \
-		--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 \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		${myconf} \
-		|| die "econf failed"
-## $(use_enable gcj) 
-
-	# Don't build the mono examples, they require gtk-sharp
-	touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe
-
-	# this gets around a lib64 sandbox bug. note that this addpredict is
-	# added automatically by sandbox.c for lib.
-	addpredict /usr/lib64/python2.4/
-	addpredict /usr/lib64/python2.3/
-	addpredict /usr/lib64/python2.2/
-	addpredict /usr/lib64/python2.1/
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Backwards compatibility for old stuff
-	# we can remove this when dbi (plural of dbus)
-	# <0.30 aren't in the tree
-	dosym /usr/bin/dbus-daemon /usr/bin/dbus-daemon-1
-
-	# initscript
-	doinitd ${FILESDIR}/dbus
-
-	# dbus X session script (#77504)
-	# FIXME : turns out to only work for GDM, better solution needed
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe ${FILESDIR}/30-dbus
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus || die "Problem adding messagebus group"
-	enewuser messagebus -1 "-1" /dev/null messagebus || die "Problem adding messagebus user"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
-
-	einfo "To start the DBUS system-wide messagebus by default"
-	einfo "you should add it to the default runlevel :"
-	einfo "\`rc-update add dbus default\`"
-}
diff --git a/sys-apps/dbus/files/digest-dbus-0.50-r2 b/sys-apps/dbus/files/digest-dbus-0.50-r2
deleted file mode 100644
index 85b1b72d4f0c..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.50-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1addd5b600a8a4550766005d1f59401b dbus-0.50.tar.gz 1610305
-RMD160 a80be17d1c117a7c218bf3a78d0a8fbae134bd91 dbus-0.50.tar.gz 1610305
-SHA256 3a8375c935f0c7b87cdd25f0408da963836fdce23390bb1b81cc6bd6ee7951c5 dbus-0.50.tar.gz 1610305