old

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

4 files changed, 13 insertions, 146 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index b9dc88965aa9..826f0d3e17da 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.89 2011/10/03 11:58:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.90 2011/10/16 00:13:12 ssuominen Exp $
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -dbus-glib-0.94-r1.ebuild, -files/dbus-glib-0.94-marshall_objs.patch:
+  old
 
 *dbus-glib-0.98 (03 Oct 2011)
 
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index da852e3779d7..2351f457fa58 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,23 +2,20 @@
 Hash: SHA1
 
 AUX dbus-glib-0.92-userpriv-fix.patch 1938 RMD160 ac5c70dbf5eddf0258ce3876bdabfb229267c7f8 SHA1 2d60ee81257b4c47b98eb21ab5b008f39a7624fd SHA256 d542a633fb81584bea4e015f7f528eb4f58fd904bbbfd2905b41cf02b70b5b2b
-AUX dbus-glib-0.94-marshall_objs.patch 1236 RMD160 44367679fee5d4acfa2f9b552d68ba6a758fd10c SHA1 a77b267090f0dfba4e2dc540875c8c491a98ac38 SHA256 696abc05410d21bfa6715c4c9b69c75aafdc5ec38a997dc605c5efdf36db6211
 DIST dbus-glib-0.92.tar.gz 687138 RMD160 63ad9e0a673f4df7d1b24f752502b697b9f54ab3 SHA1 69aa860251a2c916907ac7b34d5a40196cf073ff SHA256 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e
-DIST dbus-glib-0.94.tar.gz 705558 RMD160 38feb3745405f45b4c84a81e207dcf8697854775 SHA1 340c392cb37fd204efd9ce83424c53e4e91cbbff SHA256 e460fa9314f0d35b054355080b5c315187c9e3d02252f1b7b11195bb0c08d39b
 DIST dbus-glib-0.98.tar.gz 723825 RMD160 6ea0ee8671abd0cf454e70ac18ff7b195123eae7 SHA1 203f02e41eba1aeac8986e655d794c8833e437bf SHA256 297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111
 EBUILD dbus-glib-0.92.ebuild 2361 RMD160 b651a3946c62a5d6157a5cbceb23d92937f95069 SHA1 29337e9a7769a2b367eb8144209849a6bd7396d9 SHA256 4536a69f1d15e0c7b61190040c58719e0bf2237e5e0883c18015f44667f22801
-EBUILD dbus-glib-0.94-r1.ebuild 2180 RMD160 893f6083b1fa92bf322b6e581de672b2e72f2fbe SHA1 aa62693a5aacaaa68590677300ff9e43003b9f97 SHA256 d8c0ada8d46b22df20e28a8d2f9c63c94837a5104061d01ad2c0ab71563c5f99
 EBUILD dbus-glib-0.98.ebuild 2041 RMD160 244c33e927c28d865bd594fa333a16295c41d357 SHA1 73e29494df23352873bdcc94121c80f19b38f30d SHA256 c9571ef4120ed776ecd33801dc99813674c640e54f6138488d1edde5be66bd27
-MISC ChangeLog 11875 RMD160 b9d850798efac0b1db6b637d2edbe17bc0a8b2ad SHA1 3f4b3099c98ffff9c72a424db7d535d416697a72 SHA256 23cd11353ea1094af948fbf9bcfa2244cc933e0972e65e2fa69821fdc362034d
+MISC ChangeLog 12008 RMD160 f024594fdd08f080e425d7c7f0b68e86789ca2e2 SHA1 b32cf7db7f2cb63b6e61440e24911e66f785955e SHA256 9b2fffc45abb3a0e59497054263c58289e6266e3fdd6923b5f879ed4f4cf87ab
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOiaOWAAoJEEdUh39IaPFN5XUH/034gxSNr3zaSFQqy8BtINsI
-Hs2C8kxU9o6V/+Yxq0zuGyH4Y8nhD/G+8WuuJcnRi4rRLvDmbI/+R+w73y7hK1ch
-B8NMHP6+kbQvhQKiZsidOA6PNgrM+1IKjxk13E2R4MBJVb8j9dVKvQq3rfWG1yh0
-6slU6tltAnZzqEhE6VwYSOmmVYC/+zRYK8b2pNeMhGoUhn2wiENq6sPe9zrKuoJT
-SD/dksHuFtGjdkN9wbVff+VTXRSiSJ6DxtAH7bPKp+11n4KBn13P+MaHbXK5OTL6
-adEWoX1rnI5QX4nk9DL2EcxPi94vZPc0ATPXZwCSNAuU5n2J34SKDvsOzxGjb0o=
-=WCSy
+iQEcBAEBAgAGBQJOmiGRAAoJEEdUh39IaPFNlKEIAIm3GFelVchTlt3/OV9UZwj6
+6C+4X7OMdlsALBNaB5OsPNor4jVSC6hYxDP9wCGmOtcgiSHWvSiQC+8QDro6P3W2
+0M/htW0ztFsTjTbDsabi+ceGmiG3Y16Gq+SCMUvW5OHhkmd6HPL65I9G5G1bgfwL
+BBtAoSUrRbJCI+jIKhBaC0vOxvFvwtwkGB6LS5QpyetzoYz336nXyaA/ACzsYqsi
+IF149dcQGR1Yy7fxar0W8oEWc2MFsrWhnqDStyGtVUgtEbhpvBq12m2cJXevK6n+
+PDoT5lnfY3tkbcQuuebhaxOkRgg95DShldxGjvZ+exwL2kIhvusNGmCssaR+KL8=
+=bxAC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-glib/dbus-glib-0.94-r1.ebuild b/dev-libs/dbus-glib/dbus-glib-0.94-r1.ebuild
deleted file mode 100644
index 80f5cee2c69b..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.94-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.94-r1.ebuild,v 1.1 2011/06/10 06:56:13 ssuominen Exp $
-
-EAPI=4
-inherit bash-completion eutils
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="http://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${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="bash-completion debug doc static-libs test"
-
-RDEPEND=">=sys-apps/dbus-1.4.1
-	>=dev-libs/glib-2.26
-	>=dev-libs/expat-1.95.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-# out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-BASHCOMPLETION_NAME="dbus"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-marshall_objs.patch
-}
-
-src_configure() {
-	local my_conf
-
-	my_conf="--localstatedir=/var
-		$(use_enable bash-completion)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable static-libs static)
-		$(use_enable doc gtk-doc)
-		--with-html-dir=/usr/share/doc/${PF}/html"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf}
-
-	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) \
-			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-	fi
-}
-
-src_compile() {
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	emake check
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-
-	cd "${BD}"
-	emake DESTDIR="${D}" install
-
-	# FIXME: We need --with-bash-completion-dir
-	if use bash-completion ; then
-		dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh
-		rm -rf "${D}"/etc/bash_completion.d || die
-	fi
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.94-marshall_objs.patch b/dev-libs/dbus-glib/files/dbus-glib-0.94-marshall_objs.patch
deleted file mode 100644
index 246b85550137..000000000000
--- a/dev-libs/dbus-glib/files/dbus-glib-0.94-marshall_objs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu, 02 Jun 2011 12:49:51 +0000
-Subject: Fix regression in marshalling objects as object paths
-
-This regressed while fixing fd.o #36811. NetworkManager apparently uses
-this idiom.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890
-Tested-by: Michael Biebl <biebl@debian.org>
-Reviewed-by: Colin Walters <walters@verbum.org>
----
-diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
-index 3b0bd17..7ee0b4f 100644
---- a/dbus/dbus-gobject.c
-+++ b/dbus/dbus-gobject.c
-@@ -3049,16 +3049,16 @@ out:
- const char *
- _dbus_gobject_get_path (GObject *obj)
- {
--  GSList *registrations;
-+  ObjectExport *oe;
-   ObjectRegistration *o;
- 
--  registrations = g_object_get_data (obj, "dbus_glib_object_registrations");
-+  oe = g_object_get_data (obj, "dbus_glib_object_registrations");
- 
--  if (registrations == NULL)
-+  if (oe == NULL || oe->registrations == NULL)
-     return NULL;
- 
-   /* First one to have been registered wins */
--  o = registrations->data;
-+  o = oe->registrations->data;
- 
-   return o->object_path;
- }
---
-cgit v0.8.3-6-g21f6