Version bump with gstreamer-1.0 support. Update license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 85 insertions, 9 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 3882a787c336..654ab69519c1 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.95 2012/12/11 03:45:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.96 2012/12/19 02:43:32 tetromino Exp $
+
+*libcanberra-0.30-r1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libcanberra-0.29.ebuild, +libcanberra-0.30-r1.ebuild:
+  Version bump with gstreamer-1.0 support. Update license.
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> libcanberra-0.29.ebuild:
   virtualized the udev dependency
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 3ba5296a7f68..f3832f243870 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -5,13 +5,19 @@ AUX gconf-2.m4 1579 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba
 AUX libcanberra-0.28-underlinking.patch 1485 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4 SHA512 3d9742e40c49797fc11f409b63295a3ff753deb30630fdb7e6d2bcf8a2bd682dca3a1772c48f4bc5d697448adf7fb28ed65d849af26a8bb293c25b7c3eb53f0f WHIRLPOOL c7878ef263b4347de7f8301b2e64059e62ffcb60ae4f9067a688d68fb63bb438e790ca46292ce370a22745b1d3f4f814be0810b451977eae83fdaa34148ea676
 AUX libcanberra-0.28-workaround-hang.patch 849 SHA256 ffcac176507075d76ca360302b53a45228df785f689e95302b48200a20e4dda4 SHA512 c64cddf7771ff049f3ca4e57b8e11df00f73ab84c62f94ba37717181668cca22664edcce370547743c4b66a530a594fe05c4078d06c7865cde31ff7ec453f47d WHIRLPOOL 1ddfce1524a5b23193ac5249cabc32477e885c1a41a2212fb95e1fa41bbd6d5d9a6b1a89af462042a4a8f702ed378b09a86283666ea6d897a735f97a621a10f4
 DIST libcanberra-0.29.tar.xz 315728 SHA256 127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72 SHA512 3825e278380c01d75a933df5f76a71d62ea099da2f7422b77f6a5c7b337d23ba623a84f0b58873d485dedf96b91adc3d38608a95c8aee9410420d6306414042b WHIRLPOOL 04d7d5ee1d7925eab5f56e8bb7e4b0be31648078592037de2c94b14524fedc774cd537446129c6adf46ab2f293f276ae5cb181a25303487afc63216bd979f784
-EBUILD libcanberra-0.29.ebuild 2407 SHA256 4ab5a1de71496a879e57451cb24c31ceb299d3b2ff51aee2d0de49faad972796 SHA512 b9cc9a49394e2ad35b3a6dc90ed0164812e464b5126dc56d512051fc82cbfb83dfd6bbfb0182946a4b2c15ae2c77cca8e90345812adcd041ad84b121e0d60573 WHIRLPOOL 306a881c80f761d07e59db29a3ec9e79e9ec452214e94ef2b71d47833b853915b9d159623d3f2981313e5505a960bc61012ff7e2cfb1f541fc72dc80a2923ed7
-MISC ChangeLog 15030 SHA256 13eac648e7b99c7c98b792d6a6942775bb0895d90dc4b7b0684428741e25cfec SHA512 76e6d0b64e8446fd3b9d47d2a4436e0b009fba74b41b7767f73e4fd927c4a726f490c45e71d643ffc47850af6151e51d44a8718596c0884332496d447fd5a9b6 WHIRLPOOL f3953d5be882a0ff744c89aca92a48a212415f4c90433d0f6a6328fe534af817f2ce10bdb1502da262f026f667f3e0cd9b7abf036d78e0a1af6d2fb7469b3679
+DIST libcanberra-0.30.tar.xz 318960 SHA256 c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 WHIRLPOOL 684f0c4886f5bbc22d92500d0aa6371655106c8e788fe57d98b011e61fc0b09412edfddf782d42424009445e66bfa28ec43953ad263ea3eb0d9d9049ec479d87
+EBUILD libcanberra-0.29.ebuild 2414 SHA256 9ba1d4a3199f488e2862affac727cbfbd859c7f4cc25b978eb6acbd6d1c43bad SHA512 a9e5b72371e9100439e1c07f3e445b77acd3d431f935ab91f649f9cb589db59d1c8358f6b253e390a2702e1b7e97c7b38661a479c5f6e39f154f0e6a7acb9206 WHIRLPOOL 6ab1fb938a0e9b99f1f1faea572833aaf3801cfb5f8137fa182c148315479083f3ab5baade17a4d0b65d22ab7c1a69e325107c0c450b13cb68396fc62eca1eb9
+EBUILD libcanberra-0.30-r1.ebuild 1833 SHA256 48193b102d2497123dad12e746f588b1d8211b186ff5101f74652a454faac6c4 SHA512 42ff58d54fe5cb3ae39a2e24bb967af3ac83e44710dc8427c6b348d37d2dea075aef6c5b168012baec72dd836e289d0593600486c49cbd9d05f7fdc6bb1822ed WHIRLPOOL 319fec0bb59747df8c8fd0897783829d13632a517a9364a92d86d428acf587318de84df7fd01fc7d20a2ed26552d098c12c481d329b598847125f64725aaae56
+MISC ChangeLog 15247 SHA256 06f8be8bcc41b391c887a3589bd9df363c23eb33b3677713e6dbbee8e7d02918 SHA512 488898f6dd1e160261dbaf49804712b784e434b671e351158db81a29339e266f7c3d1e9de5213adf060cba26d57f7de1a7d72463f5bb9bf30f5ecd2a4010ba06 WHIRLPOOL 79ef6a795bc0793cc842efb54f6d70e300affa51f24be264dcc5519282dff3e59632ad1800e647285370f34adbb2aa05784dc6d0bcb85ce9d021e617ff46bf55
 MISC metadata.xml 1542 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9 SHA512 47defa808a9e568f0608ab1c09ccbdc02be391fb8a855fd16c4a9bf8d7ea86c5eeab98612ef0624706f4190cc48688d69f5831d34be8ceafebd1889071021021 WHIRLPOOL 97ac02cb17da73790ac9992d28f7c59befb5baef72c35c5dd4118ac5415b8894bb2b6c1e6d6fac9e29752d6cc283acc5967a4f04f75a71f33157673a2b77147b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDGrFgACgkQ2ugaI38ACPA7MAEAi45kojsX2Ubd9ovllaqFjQMV
-/d7xlsDhkj6qLFmCkUAA/3dRnUeJboiSXMl6nq3YiP5E9aR4vG/HnHtRde4Wr63R
-=11T/
+iQEcBAEBCAAGBQJQ0SnWAAoJEJ0WA1zPCt1hO5cH/2jPC+VqzIvdnbI+oUh1l9XG
+52ZcrYPAH5Rce9VDIE122jRe+oOh8dmqmpsKQJxIxPAtsz2pU+eG0wc3YPfqd9OC
+jxA5239GCogiZ2evLFR/eHD/CB+nliNJaAvzXl7kKOrml7FqMmDH8JvEmbqL8WHI
+p7fcW+QXiw6u3rVMOnjn+z7F6BqkuRy6AgVJZIczgVC6cqhVrQNR6fvrQaEW4viJ
+KpAok/mTBTlB8fQdOEKE5Rjz/aNn5juS2IyEgxD7VE8pwZWE5n5c654qX+ZQMBC/
+Dh/ApNxj09ADm4oAwdaIa98K3E8yhUl3YFdI6GzmgTiUtplg2hLdg3Q0BfGYN6k=
+=WHtG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcanberra/libcanberra-0.29.ebuild b/media-libs/libcanberra/libcanberra-0.29.ebuild
index ef8aa3feaa33..839549e95bd6 100644
--- a/media-libs/libcanberra/libcanberra-0.29.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.29.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.13 2012/12/11 03:45:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.14 2012/12/19 02:43:32 tetromino Exp $
 
 EAPI="4"
 
 inherit libtool systemd autotools eutils
 
-DESCRIPTION="Portable Sound Event Library"
+DESCRIPTION="Portable sound event library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
 SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
diff --git a/media-libs/libcanberra/libcanberra-0.30-r1.ebuild b/media-libs/libcanberra/libcanberra-0.30-r1.ebuild
new file mode 100644
index 000000000000..0f2c283f37b4
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.30-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.30-r1.ebuild,v 1.1 2012/12/19 02:43:32 tetromino Exp $
+
+EAPI="5"
+
+inherit eutils systemd
+
+DESCRIPTION="Portable sound event library"
+HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
+
+COMMON_DEPEND="media-libs/libvorbis
+	>=sys-devel/libtool-2.2.6b
+	alsa? (
+		media-libs/alsa-lib:=
+		udev? ( >=virtual/udev-171:= ) )
+	gstreamer? ( media-libs/gstreamer:1.0 )
+	gtk? (
+		>=dev-libs/glib-2.32:2
+		>=x11-libs/gtk+-2.20.0:2
+		x11-libs/libX11 )
+	gtk3? (
+		>=dev-libs/glib-2.32:2
+		x11-libs/gtk+:3
+		x11-libs/libX11 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	tdb? ( sys-libs/tdb:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+REQUIRED_USE="udev? ( alsa )"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable tdb) \
+		$(use_enable udev) \
+		$(systemd_with_unitdir) \
+		--disable-lynx \
+		--disable-gtk-doc
+}
+
+src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	MAKEOPTS="${MAKEOPTS} -j1" default
+	prune_libtool_files --modules
+}