Fix install of -r50, set hal/udev properly in -r1, and install more doc files in both; also add a doc USE flag that builds the API documentation.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 73 insertions, 35 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 6693f53a5e94..ef5da8a802c0 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.133 2009/07/02 10:06:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.134 2009/07/03 00:14:32 flameeyes Exp $
+
+  03 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  pulseaudio-0.9.16_rc2-r1.ebuild, pulseaudio-0.9.16_rc2-r50.ebuild,
+  metadata.xml:
+  Fix install of -r50, set hal/udev properly in -r1, and install more doc
+  files in both; also add a doc USE flag that builds the API documentation.
 
 *pulseaudio-0.9.16_rc2-r50 (02 Jul 2009)
 *pulseaudio-0.9.16_rc2-r1 (02 Jul 2009)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index dc458dd91051..bdfbd38a4c97 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -15,15 +15,16 @@ DIST pulseaudio-0.9.16-test2.tar.gz 1908588 RMD160 ec60087d2a7e62d4483e3c5680009
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
 EBUILD pulseaudio-0.9.15-r1.ebuild 4469 RMD160 4407543ee4f93ee82246d3ecd8fabd22a3b9557f SHA1 a91cb0fe17889ed20d8a90b5580dc1a91327c329 SHA256 85f7d54087b3db949091915b840c1503f220c3efbf157ccb612e879733212cae
 EBUILD pulseaudio-0.9.15-r50.ebuild 6195 RMD160 96872c7ba15c3c8fcb6a0f13b540e67284ee33a2 SHA1 86111398ed15a21c198d87415d048e899750b9ca SHA256 803bc50933ac7ace0d479fd664f34ca755478166b7c85b836b213562e3ad526a
-EBUILD pulseaudio-0.9.16_rc2-r1.ebuild 4473 RMD160 e41d336943d54aab88f3ed30384c4a20068ef28a SHA1 4e2696ee9cedb86540c7ade94822af1a97650438 SHA256 9de9c4bbe12043d5dc6f1e3bace88650173914786cb9b2ca623f42632633ab2e
-EBUILD pulseaudio-0.9.16_rc2-r50.ebuild 6157 RMD160 39537e4fc0161d4cc5f669d4a99bb0e62d057463 SHA1 f0e3aebc103367f718e36df762670d96167d3284 SHA256 371d83c6e3a69c412f8422ecdec00a9e6f9c4dda438fc9f7ba4607e4c62bac2a
+EBUILD pulseaudio-0.9.16_rc2-r1.ebuild 4838 RMD160 5c6eda6bb892e42ccdc16987a63524dee377648e SHA1 ba426fac4faff5335ea21e3887bef40e8456ccc4 SHA256 309daa9c2be2eaa26db3bf35828649614c97e9b6b6fe0db5b2c70b557fb19974
+EBUILD pulseaudio-0.9.16_rc2-r50.ebuild 6325 RMD160 2125993ef2d1d261a899b9032de88b362062f187 SHA1 3ff38278006455ddec927223c1dce5080bb07ee4 SHA256 49c673c52762d91284172646d559ef5525aa3a6fc6c3b7d18f91d53240cc90b8
 EBUILD pulseaudio-0.9.9.ebuild 5797 RMD160 a3e829dc0f9c5ddfcb2f6bde0964a1ea6934a832 SHA1 e418cad6fd7ddd3dda0fdf51bf738ea4e35563ff SHA256 bb4be3fa7cc13e0118db3741af201b83db5a39d938e57864443f78f35897ab43
-MISC ChangeLog 25518 RMD160 5a3e0937077b49e90b14e1b9f66d381bf7d8002e SHA1 b44d590241d42ab9c9b3b592d442de3dc70fc8b6 SHA256 0c03660c30dd8a3fd81f496d98a48fd706f8be09c2d9a29f97db8a17316a2bc1
-MISC metadata.xml 1336 RMD160 fff3b1ef9cc533d3e40816de7b39cc7789d6056e SHA1 3a8b478a30b18c7b0311eb78ca6e60ec3cd12d2c SHA256 1ca2733f429248a115989cdd9a9530af57b5021cc1ecfdbbb8ed23c6414894ff
+MISC ChangeLog 25810 RMD160 705bef5fd27abc8ffa6dfa34f39e8a9fded62a72 SHA1 b05d9cbea674f012262865844c5cfecd4ea7e011 SHA256 bddcf7fc37a73fcecd224897921a82a9d7a17a9afd32d74ca43e121396d2cf5f
+MISC metadata.xml 1449 RMD160 1074867d9654a4550bb17d32aea93c3be969c79a SHA1 6f04434e3cfa72d1df35f9a0398f2f95a86156c4 SHA256 551909c453b7163940bc1761eeadbe36b37d07d47ae37b4adcfad05109ea16f0
+MISC pulseaudio-0.9.16_rc2-r1.ebuild.rej 506 RMD160 88f2f0da8e57a46bf77417a23c5b3303fc7dd916 SHA1 610afa61f791d297942f38fcecd446b1d08523de SHA256 2278149707872aba3ccfaa81910ca2ce3bf28edf52a870d72c7ff6a55e326d14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpMhr8ACgkQAiZjviIA2XiBagCfdrYRK6d7VBSiZtMvxzNGGr2K
-cBYAn2lhltdiIhBse+yIpjrtYZuCo3uY
-=NktK
+iEYEARECAAYFAkpNTW4ACgkQAiZjviIA2XjFzQCfcNu1VgBy0VMWL95Egq7Slvb+
+ElIAmwcQ82fgcYqxc/Yi4DffMVM29kdb
+=tcM6
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 23c58bc06a81..f8848367a267 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -4,31 +4,32 @@
   <herd>sound</herd>
   <use>
     <flag name="X">
-    Build the X11 publish module to export PulseAudio information
-    through X11 protocol for clients to make use. Don't enable this
-    flag if you want to use a system wide instance. If unsure, enable
-    this flag.
-  </flag>
+      Build the X11 publish module to export PulseAudio information
+      through X11 protocol for clients to make use. Don't enable this
+      flag if you want to use a system wide instance. If unsure, enable
+      this flag.
+    </flag>
     <flag name="gnome">
-    Use GConf to store user preferences on streams and so on. Don't
-    enable this flag if you want to use a system wide instance. If
-    unsure, enable this flag.
-  </flag>
+      Use GConf to store user preferences on streams and so on. Don't
+      enable this flag if you want to use a system wide instance. If
+      unsure, enable this flag.
+    </flag>
     <flag name="oss">
-    Enable OSS sink/source (output/input). Also build the padsp
-    script to make OSS software use PulseAudio.
-  </flag>
+      Enable OSS sink/source (output/input). Also build the padsp
+      script to make OSS software use PulseAudio.
+    </flag>
     <flag name="policykit">
-    Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to
-    acquire high-priority and real-time scheduling for the daemon.
-  </flag>
+      Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to
+      acquire high-priority and real-time scheduling for the daemon.
+    </flag>
     <flag name="glib">
-    Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
-    libpulse client library, to allow using libpulse on glib-based
-    programs.
-  </flag>
+      Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+      libpulse client library, to allow using libpulse on glib-based
+      programs.
+    </flag>
     <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
     <flag name="glib">Enable glib eventloop support</flag>
     <flag name="policykit">Enable support for PolicyKit framework.</flag>
+    <flag name="doc">Build the doxygen-described API documentation.</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild
index 64c0562a3b4d..578a0f11ecfe 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild,v 1.1 2009/07/02 10:06:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r1.ebuild,v 1.2 2009/07/03 00:14:32 flameeyes Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P/_rc/-test}"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib test"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib test doc"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	caps? ( sys-libs/libcap )
@@ -53,6 +53,7 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
 	X? ( x11-proto/xproto )
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
@@ -105,6 +106,12 @@ src_configure() {
 		--with-realtime-group=realtime \
 		--disable-per-user-esound-socket \
 		|| die "econf failed"
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf || die
+		popd
+	fi
 }
 
 src_install() {
@@ -112,8 +119,19 @@ src_install() {
 
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
 
-	dohtml -r doc
-	dodoc README
+	# the “true” condition should be replaced by “use udev” once
+	# that's enabled.
+	if use hal && true; then
+		sed -i -e 's:-udev:-hal:' "${D}/etc/pulse/default.pa" || die
+	fi
+
+	dodoc README ChangeLog todo || die
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml * || die
+		popd
+	fi
 
 	# Create the state directory
 	diropts -o pulse -g pulse -m0755
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild
index 2fbad1687baf..29a513ffef78 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild,v 1.1 2009/07/02 10:06:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.16_rc2-r50.ebuild,v 1.2 2009/07/03 00:14:32 flameeyes Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib test"
+IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth policykit asyncns +glib test doc"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	caps? ( sys-libs/libcap )
@@ -51,6 +51,7 @@ RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
 	X? ( x11-proto/xproto )
 	dev-libs/libatomic_ops
 	dev-util/pkgconfig
@@ -114,6 +115,12 @@ src_configure() {
 		--disable-per-user-esound-socket \
 		--with-database=gdbm \
 		|| die "econf failed"
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf || die
+		popd
+	fi
 }
 
 src_install() {
@@ -144,8 +151,13 @@ src_install() {
 		sed -i -e 's:-udev:-hal:' "${D}/etc/pulse/default.pa" || die
 	fi
 
-	dohtml -r doc || die
-	dodoc README || die
+	dodoc README ChangeLog todo || die
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml * || die
+		popd
+	fi
 
 	# Create the state directory
 	diropts -o pulse -g pulse -m0755