old

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

3 files changed, 12 insertions, 198 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index ad12574d8a7f..06760f01ae40 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.313 2011/11/11 17:37:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.314 2011/11/11 17:38:29 ssuominen Exp $
+
+  11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -dbus-1.4.16-r1.ebuild:
+  old
 
   11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.16-r2.ebuild:
   Block any glib with obsolete path to machine-id wrt #390143 by Ewgenij
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 7c7ad5109caf..4816c6035661 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -8,19 +8,18 @@ AUX dbus.initd 1185 RMD160 ddb4df28657c7cbceb20c67c95d78a982106759f SHA1 21cc5f0
 DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722 SHA1 6288a0826fe02d02ddbe62af03c9401501e69cc2 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7
 DIST dbus-1.4.16.tar.gz 1889465 RMD160 8a63492090acd717e6a58f63026181e78ae089f0 SHA1 d6e6538cfc1ed71992f6786a6da55d815d995b5b SHA256 1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6
 EBUILD dbus-1.4.12.ebuild 5033 RMD160 7fa7355bea5e98fd6119da855c88880093c15f38 SHA1 17e12b2302990f2fe9e6eeebe31b0ef4eddac328 SHA256 bda8a2dc34b8778c99df13f75b5c4def5b5f5cdf7cdbebed1cee1771209cdbec
-EBUILD dbus-1.4.16-r1.ebuild 4808 RMD160 e4aa5370c62f3f1cca880cc209546cd2c9f7f5ba SHA1 d5e1b778e6fc315b5cc584ca04d3db3876b35f2e SHA256 7a5be834f81f2c9415a8cab49804125099a24a60ce87ed7d24a985c28eba1e00
 EBUILD dbus-1.4.16-r2.ebuild 4843 RMD160 aff06595d4cc62866c97e7b0555eefcc96b20621 SHA1 391f3b67501e3ec8b6d9124bc200112f4a000937 SHA256 e5758cefe95614bd0ee83f1f276f08f8f0cabea8946ea2efbe49c5b68af8dbc9
 EBUILD dbus-1.4.16.ebuild 4868 RMD160 9f60f90bb4513bca0cefa9c06c1c974aff6a476b SHA1 10fafa5e37c6d3a2ca2c4bd928b1cd1639555e67 SHA256 836a31a5ddb8d14f61902efdf19c5238f3d99ee384acc34870c59a277987d69a
-MISC ChangeLog 46712 RMD160 8034823a7ffd68861a3731b59ed54cf07314f96e SHA1 8dcc016ae277519f3efdab614b6b037ae79d0e30 SHA256 518a00a2310ae1268d8da10eec5695e94dc02905b8575ed666e8ff0f748c6a11
+MISC ChangeLog 46797 RMD160 4e26af9b890ba15c5874049c8acb74d80459b027 SHA1 d4276bc318e2c99f3f09152dfb93385298d14f03 SHA256 2bcc1d3f47afffc02d7c04900e9cc59757bbf8bc7ae0885ff46c3c7fc4e1d884
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOvV0sAAoJEEdUh39IaPFNPxMH/0real9tE1/0P36IKr+MLvQj
-pr8rjbogMQugjgR6F/p9g44sphTMTdZ/0+2XG2TypYMvxLf2O/fjy5pIdmbXT7sJ
-jDMEzt0O0ZF6KKRYeY2z0yZ2mVxZ7IHvxOCybOoAlhX8VxIn9kwi7J847UHKpmeX
-d5yt6W/1fm8FZI4IktRkePqmsvP6OgzW57Q+9Od+FL6ERcvqH2YAllg6Tj8NrUVi
-nQoiHmQC9y8z0SFhlZttEueXsLXgAMyJkhXHeK/eE6/ODvfQkopuekaKgKActbxS
-lOKkJNFRUGCLh4yj92oBFSLzSQf5wt36WVk2p44Z7Mtuar2Bdwdf2Il0w1gH14s=
-=7RUy
+iQEcBAEBAgAGBQJOvV1ZAAoJEEdUh39IaPFNqF8IAJUO77zm0NLrqJsGVomLqviI
+h51NPjnvOV8RKUopUMzvbkRgevxZqBNmQQ4TePgz07NEz8sG96IoDf4TCXRTQ+nh
+uehU9JTp24W35Bx3dQX2UxUOhF1fD+hUU2gmGwgVXMsHLuj2/7UhYx/aiWe9aKwo
+SzRVLb919vvSt0wXw/JBBS3I4zPobTQuHj5Ezd6RzQja59DYymUNx6Ia6qLZsJ83
+7IxUOT/aYXFPzs8wEVdg2e3QVi5Edbj9G37gbW2Qos7VkdpQ4UBIHwUlosAt6ieh
+jZ2sbBHgeeRbFq7SGO3BPPu1yRnyTpJs6MBpuMKFdNlsggD+TqPV594uY+1OviE=
+=u9je
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.16-r1.ebuild b/sys-apps/dbus/dbus-1.4.16-r1.ebuild
deleted file mode 100644
index a2b1be640113..000000000000
--- a/sys-apps/dbus/dbus-1.4.16-r1.ebuild
+++ /dev/null
@@ -1,188 +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.16-r1.ebuild,v 1.1 2011/10/20 20:46:36 axs Exp $
-
-EAPI=2
-inherit autotools eutils multilib flag-o-matic python systemd 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"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-dbus
-	)
-	>=dev-libs/expat-1.95.8
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	)
-	test? (
-		=dev-lang/python-2*
-		>=dev-libs/glib-2.22: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() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		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="--disable-asserts
-		--disable-checks
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_with X x)
-		$(use_enable debug verbose-mode)
-		--disable-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
-		$(systemd_with_unitdir)
-		--localstatedir=/var
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html"
-
-	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
-		local circ
-		has_version dev-libs/dbus-glib && circ="--enable-modular-tests"
-
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(use_enable test asserts) \
-			${circ}
-	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
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check || die
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die
-
-	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
-	fi
-
-	# 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
-
-	cd "${BD}"
-	emake DESTDIR="${D}" install || die
-
-	# 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."
-
-	# Move to /etc per #370451 and ensure unique id is generated
-	[[ -e ${ROOT}/var/lib/dbus/machine-id ]] && \
-		mv -vf "${ROOT}"/var/lib/dbus/machine-id "${ROOT}"/etc/machine-id
-	dbus-uuidgen --ensure="${ROOT}"/etc/machine-id
-}