Version bump.

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

3 files changed, 201 insertions, 9 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 189f78b954c4..c2b85e9e3e2d 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.318 2012/02/01 01:58:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.319 2012/02/14 21:12:06 ssuominen Exp $
+
+*dbus-1.4.18 (14 Feb 2012)
+
+  14 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> +dbus-1.4.18.ebuild:
+  Version bump.
 
   01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -dbus-1.4.12.ebuild:
   old
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index a31066d2e4be..f4a7a850698a 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,18 +6,20 @@ AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1b
 AUX dbus.init-1.0 1176 RMD160 1ad53e5859c94794b4dfcb0455bb63a0b858b83b SHA1 85a284e2f714f0b9e7f77d74be4325e2ac088e54 SHA256 2db2b6ea36854997f93ee0d0dfc470a1d1c792d355944a1272ba45b219ab61dd
 AUX dbus.initd 1185 RMD160 ddb4df28657c7cbceb20c67c95d78a982106759f SHA1 21cc5f013e061311d181b2eb6975f0fff48744da SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01
 DIST dbus-1.4.16.tar.gz 1889465 RMD160 8a63492090acd717e6a58f63026181e78ae089f0 SHA1 d6e6538cfc1ed71992f6786a6da55d815d995b5b SHA256 1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6
+DIST dbus-1.4.18.tar.gz 1893155 RMD160 cca7fd10a0e958ee5ada0bc0a591f567242dd959 SHA1 7586cea68193ba9df6c03d2731b8c675ca2bd52c SHA256 b5e0c3bd37fa0ca5e86e8d17c375d754de6cd5c1d46d5f2158a36ddd51de18cf
 EBUILD dbus-1.4.16-r2.ebuild 4845 RMD160 17e6c19fac0fb1da8361b8ad8b5a0dd25e8ac7f1 SHA1 09e366f416b23576ff3c228d3aa72a52a2fa3e5e SHA256 f2c7c65116d4aae6d44fe0decdabb46bd4e4e0f88c1060367927195f2c393811
 EBUILD dbus-1.4.16.ebuild 4864 RMD160 67653b12f60129d72eb4670c8e25f7641a4498ec SHA1 cf9c24fc8fdec1ca8485fb9d83192f02c99c71bc SHA256 93182ac668d64c546fc398ec827681535b8351b6516cb687f906a1f03726eef6
-MISC ChangeLog 47230 RMD160 183e440409ac7687a48cc53902da79477cd94ce4 SHA1 7e74b2ea9a07261008fc3fa5957d8ddcc846f24c SHA256 c47b3e96b21849f82eb34d615bb0f1ad71bdcf82ddf68e1cffe22f4ecec81bbe
+EBUILD dbus-1.4.18.ebuild 4772 RMD160 6c2657bae876ce1f26f504a2e2ffcf7d3748467b SHA1 3cf33deffc674b149c1d156787e5446c8cfdae17 SHA256 3540c9a7d3f33d65e60820e64b2cebc34824b641227b7a4f70b44eb815a442c6
+MISC ChangeLog 47350 RMD160 050e77c1ce5abb83c1f5ad27e9e9c8fddedb9034 SHA1 8eb728ecc2e0bee96979e7aa8b80eaf40893dd80 SHA256 6a5c018c53aa4962bcab5b17d8b4b3750acc347e2e747cc440a3d687c954d4bb
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPKJurAAoJEEdUh39IaPFN/kkIAJqcT1Wou6Rub/lL6wbi7PW2
-ck90W2vlETPllYhp6gy3YdqK2xopnsZEwv/PKlRY7+G3ZxhG9/haz3nvJxdODP75
-evwP6xVXdkS7u98tb25fMoogtvGvbRiV/VAfpq45D6ZkEpj+RzKF/DxFhxgNpSts
-/D0h3fDdwE5eDgLORVyle0nFU3h22AC3bthqMyE7mlKtEBMuCU4k5GogdqC9D6Se
-x3o5d1ph0mA/6ZN2x45uTgLl9hhsEKArmdNLleQsF+cJVjDVUunxmJWk0M0+lA1D
-djs5qJ4PD3hPyDgatM1VVG5v5iTge4cpBCLIG3ca08dAcNvbSusDjc941jLp9AI=
-=MJCv
+iQEcBAEBAgAGBQJPOs1zAAoJEEdUh39IaPFNIHgH/RCiZszbIH03LbbptHYh+Ph0
+BIHakbJikhtJ36s7QsrP8dQLt/kRHYT+hGJocgAlQZfBZBUkJwgY+KuepaPy8WGY
+/84ObFcNlSGbOWlnAADC1q+Z200kuLhCemouqSy3KPUbpDmOEdSmPCzQnurKlgkV
+lyD6TgSks3VKYAiHAWjwjt+P+wktu/uLxkNxUBkr2ND5sPVMcQOuEnryOdJAZRy1
+1LevZLjXfv/XFuiLIj04SsPtPJOWWIbXQzaXA5IAgDB8L1jqY58MzRb80KKpm9Mw
+E8NihAUPz4M5t9T69c3SLVbZK8KYjLrLiUH6Ts3GW7yPIR0mmPcsLxoEzcPsyUU=
+=6Wmw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.18.ebuild b/sys-apps/dbus/dbus-1.4.18.ebuild
new file mode 100644
index 000000000000..86065b59c023
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.4.18.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.18.ebuild,v 1.1 2012/02/14 21:12:06 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="test? 2:2.7"
+PYTHON_USE_WITH_OPT="test"
+
+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=">=dev-libs/expat-2
+	selinux? (
+		sec-policy/selinux-dbus
+		sys-libs/libselinux
+		)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+		)
+	test? ( >=dev-libs/glib-2.28 )
+	!<dev-libs/glib-2.30.1-r2: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)
+		$(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 cir
+		has_version dev-libs/dbus-glib && cir="--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) \
+			${cir}
+	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
+
+	if use test; then
+		cd "${TBD}"
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+src_test() {
+	cd "${TBD}"
+	DBUS_VERBOSE=1 Xemake -j1 check
+}
+
+src_install() {
+	# initscript
+	newinitd "${FILESDIR}"/dbus.initd dbus
+
+	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
+	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
+
+	cd "${BD}"
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -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 ${EROOT}/var/lib/dbus/machine-id ]] && \
+		mv -vf "${EROOT}"/var/lib/dbus/machine-id "${EROOT}"/etc/machine-id
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+}