old

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

3 files changed, 5 insertions, 135 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/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