old

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

4 files changed, 13 insertions, 160 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 8076516209b4..c3d667ba41b9 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.97 2012/02/01 01:56:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.98 2012/02/01 01:58:04 ssuominen Exp $
+
+  01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -dbus-glib-0.92.ebuild,
+  -files/dbus-glib-0.92-userpriv-fix.patch:
+  old
 
   01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> dbus-glib-0.98.ebuild:
   ppc/ppc64 stable wrt #387257
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index f0866ec6781e..9c90cede273f 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dbus-glib-0.92-userpriv-fix.patch 1938 RMD160 ac5c70dbf5eddf0258ce3876bdabfb229267c7f8 SHA1 2d60ee81257b4c47b98eb21ab5b008f39a7624fd SHA256 d542a633fb81584bea4e015f7f528eb4f58fd904bbbfd2905b41cf02b70b5b2b
-DIST dbus-glib-0.92.tar.gz 687138 RMD160 63ad9e0a673f4df7d1b24f752502b697b9f54ab3 SHA1 69aa860251a2c916907ac7b34d5a40196cf073ff SHA256 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e
 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.98.ebuild 2030 RMD160 eaf8077201e55f60a405a5f63f0ac821e9718ee3 SHA1 d1c34ca4ea3df98f1fec88267f54f23c5fe98257 SHA256 d2005729a65bcafd498f525a10184b750e5cdbc731f16cc5e01c176d9a14f2f1
-MISC ChangeLog 12757 RMD160 4a15b4d2a9478957d647d0eaee0d55cd93e64d77 SHA1 f686b96a383e058248a6c17113e51a4f6bc62365 SHA256 c7f6fa73811f6c492d1ae988278520ecc631bab40e34bb72d856d3a33edc4a73
+MISC ChangeLog 12886 RMD160 0be70df6a327c07fb5c5bc33f48ec1210526e30d SHA1 6d395524a5dcf75a9bd400425aab8ac7d301d4bb SHA256 5be33672ae03fd28edb76f9c1da8561c99852919fe2bd800121124c14d72797b
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPKJtKAAoJEEdUh39IaPFNnZAH/RL5uCnbj3m/x3mDnK6CewSy
-3BJ/Yu0HmeEGniDuj50pldpCzC0x6wIs03hBWk9sxavZFvc+Fr22i896HYJywfU9
-ZBacI+/A8PsH67MniP5V2WvYFa3dBuyuXJkPOVhyEp7U5JCsQ2i6QfGrECV/TtW7
-bH1tcTa73xoB77i6/aUsV/OnOxI+0Koqp3XTmMDh6Ueg/OVzQiuhs9yPyRFi1f+b
-YN1PvvXKPWc0HL24DMax/MEI/9F5GfL6sme+v1JoMtKCVUccTXFphiUgUm8Nror+
-pFrSvqT9AOLqopt6HYhyR6+A1REXU8wzvNEUfZiheObErxv688H0G84ACWkUWsk=
-=wKEG
+iQEcBAEBAgAGBQJPKJuUAAoJEEdUh39IaPFNez8H/iaG+izO40Ecr0XGrrGd4aBN
+RQuKow3SII/I8RTYCvS8vj7hv0uYVs/aLTOMWBWhcR0TRwMKEocW0LOwHKrPJhls
+kepYZ+6KXmvLClCMnUcVPHG2AyQdtiZeG5TEJ3gICseKs9Jy+gcR5qos5Ny9xX1+
+ohIYrthShtLqSk0AexGI5hfB1H4kFu+W2sAAtIN902S2YjvlHQpQouuyzqB+2wYk
+3XRzyM0BvJE0oTIqs6cxa2qGZlLjrNSxE21OWc8JnAGWDg5RAeEg0DNCNv8fMepY
+uWA+5w9+IK63pHXzuJPieFWClZSwdvQMICfI3WUModJ6cEnInuZUmf5tmJ+YmEY=
+=3hEY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-glib/dbus-glib-0.92.ebuild b/dev-libs/dbus-glib/dbus-glib-0.92.ebuild
deleted file mode 100644
index a10e181f09c7..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.92.ebuild
+++ /dev/null
@@ -1,101 +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.92.ebuild,v 1.11 2011/03/22 20:05:27 ranger Exp $
-
-EAPI=2
-
-inherit eutils bash-completion
-
-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
-	sys-devel/gettext
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-		>=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() {
-	# Apply upstream patch to fix build with FEATURES="userpriv", bug #
-	epatch "${FILESDIR}/${P}-userpriv-fix.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 doc doxygen-docs)
-		$(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 || die
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	emake check || die
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog HACKING NEWS README || die
-
-	cd "${BD}"
-	emake DESTDIR="${D}" install || die
-
-	# 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.92-userpriv-fix.patch b/dev-libs/dbus-glib/files/dbus-glib-0.92-userpriv-fix.patch
deleted file mode 100644
index f240b8cf8987..000000000000
--- a/dev-libs/dbus-glib/files/dbus-glib-0.92-userpriv-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2d987890c3ba2fd8efc92f8b75da88904ce425f9 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue, 04 Jan 2011 18:04:11 +0000
-Subject: Run run-with-tmp-session-bus.sh directly rather than via ${SHELL}
-
-It has a correct #!/bin/sh line and is executable, so just running it is
-fine. This avoids running it under a user's chosen interactive shell,
-which might be non-POSIX (zsh, csh). Gentoo Portage apparently sets
-SHELL to /bin/false, presumably to trap this sort of thing.
-
-(I've tested this on Debian unstable with /bin/sh -> /bin/dash, to check
-that weren't accidentally relying on $SHELL being bash or similar.)
-
-Based on a workaround from Myckel Habets on the Gentoo bug.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27193
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=254192
-Reviewed-by: Colin Walters <walters@verbum.org>
----
-diff --git a/test/core/run-test.sh b/test/core/run-test.sh
-index 0351472..216c2a3 100755
---- a/test/core/run-test.sh
-+++ b/test/core/run-test.sh
-@@ -18,7 +18,7 @@ export DBUS_TOP_SRCDIR
- if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
-   DBUS_TEST_GLIB_IN_RUN_TEST=1
-   export DBUS_TEST_GLIB_IN_RUN_TEST
--  exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
-+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
- fi  
- 
- if test x$MODE = xprofile ; then
-diff --git a/test/interfaces/run-test.sh b/test/interfaces/run-test.sh
-index 385efdc..5c57c80 100755
---- a/test/interfaces/run-test.sh
-+++ b/test/interfaces/run-test.sh
-@@ -12,7 +12,7 @@ export DBUS_TOP_SRCDIR
- if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
-   DBUS_TEST_GLIB_IN_RUN_TEST=1
-   export DBUS_TEST_GLIB_IN_RUN_TEST
--  exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
-+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
- fi  
- 
- echo "running test-client"
---
-cgit v0.8.3-6-g21f6