From: Samuli Suominen Date: Sun, 16 Oct 2011 00:12:34 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99adc05dc80c48f8f0f5cb2e0b61f3b521871cb6;p=gentoo.git old Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 775e708365fb..f1d7f5111b1b 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.303 2011/10/04 08:06:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.304 2011/10/16 00:12:34 ssuominen Exp $ + + 16 Oct 2011; Samuli Suominen -dbus-1.4.14.ebuild: + old 04 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: Fix install location of system-activation.txt and remove useless dohtml wrt diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 116510cc6b37..cbe58a640072 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -5,21 +5,19 @@ AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fb AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562 AUX dbus.init-1.0 1176 RMD160 1ad53e5859c94794b4dfcb0455bb63a0b858b83b SHA1 85a284e2f714f0b9e7f77d74be4325e2ac088e54 SHA256 2db2b6ea36854997f93ee0d0dfc470a1d1c792d355944a1272ba45b219ab61dd DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722 SHA1 6288a0826fe02d02ddbe62af03c9401501e69cc2 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7 -DIST dbus-1.4.14.tar.gz 1880298 RMD160 fe48465c7505b7f0f96b4d4c1eb80194d21aaded SHA1 40ccb6ff7b6f7a018cf020fef7c06131f7e5871c SHA256 47f27efc29aa9d1cc64b74e374204084d6fd53191e70dd584b604181059e5877 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.14.ebuild 4926 RMD160 45b681904c243ff40a388df7a3ea172b6f145092 SHA1 2bde5d9c86309d5e1f20e636cef6461194f18843 SHA256 5adc2dc59afd56cc72b3480a14f7f1c6ff44bd5b91b867523b40b25cc1d82f88 EBUILD dbus-1.4.16.ebuild 4885 RMD160 d7fc5fabaf0e8faf7ab8b0514ece2ee7aa6ecbbd SHA1 e4ba02163d9862c4a09b190b38f448c00415029a SHA256 c0ecc2346cfeef45326a12788fa3bd0bfd45247b9f99f82bdf5d014cb5c9bf48 -MISC ChangeLog 45410 RMD160 c1cdbca70de8d2f959cc8fd44276115e16386f74 SHA1 8956311bc21c50990723c43c1272eef23f88ed72 SHA256 e6a63e44c781dfb0fe851cd304506247eb76478910b0dd56db01919e8f1bed51 +MISC ChangeLog 45492 RMD160 4e0d7a09bdd46824404833a6a19e597835812c22 SHA1 f4d936f6153834adca22eed462411599db76a85d SHA256 c5f5f1e014847bbcca37a4ce8b1656ebb233bdc98d6e7fbe60cbf971b95a52fe MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOir6XAAoJEEdUh39IaPFNOi8IAINakrPQqUz/Z+hwGovE1+0v -JoHLH1IT3qhp71+iv0bJGsT2AmWcYxixQH+qVUrLKYOjbbT45XvkH1H8IOCIHi5b -/h6h+dRIbqlgRYcqRkxnZSCEh/gPQwB2I62CUey+TU8UwXGuz+mRuIksii5764oP -XctVQzkHxJ0hMNCb6+JCKeP2DQv3XWipyASmGq5t5JVkYGpRvF6DUGfOaKbarY+o -jld0fBWuT5pPeMlgTGsXyZHKO7ljM2+1hdMeqRsjwGbZVxjaEAt7DUD6XD78Mi6Y -fDuRM/xSpwCbpmsaxcB01Ks4RFh70hdM1qsIEhAZDJCW2LO+4QL6/KbXwfANj2U= -=g2Zr +iQEcBAEBAgAGBQJOmiFqAAoJEEdUh39IaPFNCgsH/3E9VgO8+BqiTrSsm58QU+Es +dY1okLtvVWZoslQRXJ8uPEaGmBNT7fzbYRSZl3ldmxcUc5klHf53eUzoLE+mLqtE +yjV9bKNRg+9eEaP6ogQ+TaHUbtquL8NKjrzU4fG2HUts3+t4mtbE4xxasEb+t+cG +rsdvFB0ZpzeLuR3hBv27lotDS2ihm0st6bOEYYc5FnUSF7i7biOHd4rQiv8IYDjZ +cgjZx70EfVGD0LcR4Lpi64qDHCTVFyjL/1ODgqSbH4tFeupgqivHpnO0YUy162O4 +kQk7zQ+LExHsfgbFqWa+tD0OiCrsWxojUK/ugYk28uXlf13StAwoypFSZKrCihA= +=dYqk -----END PGP SIGNATURE----- diff --git a/sys-apps/dbus/dbus-1.4.14.ebuild b/sys-apps/dbus/dbus-1.4.14.ebuild deleted file mode 100644 index e8f0813675f1..000000000000 --- a/sys-apps/dbus/dbus-1.4.14.ebuild +++ /dev/null @@ -1,191 +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.14.ebuild,v 1.1 2011/08/05 14:30:34 ssuominen 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="$(use_with X x) - $(use_enable debug verbose-mode) - $(use_enable debug 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 - --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 circular - if ! has_version dev-libs/dbus-glib; then - circular="--disable-modular-tests" - ewarn "Skipping modular tests because dev-libs/dbus-glib is missing" - fi - - 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 modular-tests) \ - $(use_enable test asserts) \ - ${circular} - 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 the system socket - keepdir /var/run/dbus - - # 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 - dohtml doc/*.html || 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 -}