diff options
| -rw-r--r-- | gnome-extra/gnome-media/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/gnome-media/Manifest | 6 | ||||
| -rw-r--r-- | gnome-extra/gnome-media/gnome-media-2.26.0.ebuild | 13 | ||||
| -rw-r--r-- | gnome-extra/gnome-media/metadata.xml | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog index ba5225205f9b..3677d7197ae9 100644 --- a/gnome-extra/gnome-media/ChangeLog +++ b/gnome-extra/gnome-media/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-media # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.194 2009/05/10 20:58:09 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.195 2009/05/12 14:26:19 nirbheek Exp $ + + 12 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> + gnome-media-2.26.0.ebuild, metadata.xml: + Fix bug 269548, IUSE=canberra -> +sound, remove no-longer-existing TODO + from dodoc *gnome-media-2.26.0 (10 May 2009) diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest index 0bd96322676c..0b786a010aa7 100644 --- a/gnome-extra/gnome-media/Manifest +++ b/gnome-extra/gnome-media/Manifest @@ -9,6 +9,6 @@ EBUILD gnome-media-2.20.1.ebuild 1658 RMD160 8b513d7ee97a9e545c11c8d4108d298446c EBUILD gnome-media-2.22.0.ebuild 1954 RMD160 79cc1fdd19eca3453da9d8cd5fe7031cfde2ffe9 SHA1 db1c2ad6a53af9b0aad51e9471d1aed7a550b3f3 SHA256 f1e8d91c4d174d670955bbf4f7b5e5a6288dbb484b8796f350958f6aa0d1f46a EBUILD gnome-media-2.24.0.1-r1.ebuild 1928 RMD160 a06dec7d10019d242319d4b209999ccc92f4e7e5 SHA1 8c11f47118f75b25e69065f9a4f363daa859d6ac SHA256 df90a112dfa1f61586c940c4029dcb0682e67b01d30f1ba4275435e6a9d2c5ea EBUILD gnome-media-2.24.0.1.ebuild 1853 RMD160 07859bcf6693b7e0be1c2d986559246b9a4325c4 SHA1 c27586403ced5654806aa94543bca5285f0801f7 SHA256 cc8e3cd7c586b7ac9d720367eb66a8f64c3356ff26c58c0b94201e6333d83d67 -EBUILD gnome-media-2.26.0.ebuild 2526 RMD160 cd9f5e37303eaf219a8b627f0ff259b3cad0a072 SHA1 dfb7014ea97a7aeb76c5da0529d177408aec671f SHA256 6e7476d209d66dab2a273da36118dda4efb4936c682f468ab08d54e28f40291f -MISC ChangeLog 24457 RMD160 0be12840b46ab44942e7537f6b9a271b706012f7 SHA1 d1d22c3d4250e2e69d92e18cecae28746a6b6530 SHA256 98de2c9a7f53b0a8ffe06fa8c6053edd2cffc2a83e48f3b7f54cc5dddcabc37e -MISC metadata.xml 342 RMD160 4b0bede36ad0b81401ea348c0e4a1eccccb2ff3c SHA1 87461ae3b9da1e69f44c5868b0fb8b0453c62dd4 SHA256 6cc513f83a39eba959301938c88b5707e3c9bafc107faf0ad4946f3398a46fe7 +EBUILD gnome-media-2.26.0.ebuild 2631 RMD160 67c21fb49b9187f7c4d1c422d237d78d69ecb391 SHA1 557d11a0238c9606c8f011a858bc442a099eb759 SHA256 89bcbf43f8a2916313206fcf9643b7a0ed9b431dd39f220ab3fc4b89a985edc4 +MISC ChangeLog 24638 RMD160 58cd75dabf10cf7286f84a13a143a8c3533d9ab2 SHA1 a1ed0333dc812aff4141896a36c0adb8ed87fe18 SHA256 c2e23c9ea05f0873d605fd63339e9ae470e19c45d435e3f1df483671361f7f3c +MISC metadata.xml 339 RMD160 bbf6402aadd2e37cf510214bd63b56627d88c19a SHA1 c1844224e92e5f691b8f59c9811bb8fe35751932 SHA256 0c92a127c7c041ad9eb833dc79524111e674facc15bd482f4ac0eb048f7d63f1 diff --git a/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild index d84412733b08..aaa80e7d8fae 100644 --- a/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild +++ b/gnome-extra/gnome-media/gnome-media-2.26.0.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/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild,v 1.1 2009/05/10 20:58:09 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.26.0.ebuild,v 1.2 2009/05/12 14:26:19 nirbheek Exp $ EAPI="2" @@ -12,7 +12,7 @@ HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php" LICENSE="LGPL-2 GPL-2 FDL-1.1" SLOT="2" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd" -IUSE="canberra esd gnomecd ipv6 pulseaudio" +IUSE="+sound esd gnomecd ipv6 pulseaudio" RDEPEND=">=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.15.1:2 @@ -24,7 +24,6 @@ RDEPEND=">=dev-libs/glib-2.18.2:2 >=media-libs/gst-plugins-base-0.10.3 >=media-libs/gst-plugins-good-0.10 >=gnome-base/orbit-2 - canberra? ( >=media-libs/libcanberra-0.4[gtk] ) >=dev-libs/libunique-1 gnomecd? ( >=gnome-extra/nautilus-cd-burner-2.12 @@ -34,6 +33,7 @@ RDEPEND=">=dev-libs/glib-2.18.2:2 >=media-plugins/gst-plugins-cdio-0.10 >=media-plugins/gst-plugins-cdparanoia-0.10 ) ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) + sound? ( >=media-libs/libcanberra-0.4[gtk] ) dev-libs/libxml2 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1" @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0" -DOCS="AUTHORS ChangeLog NEWS README TODO" +DOCS="AUTHORS ChangeLog NEWS README" pkg_setup() { G2CONF="${G2CONF} @@ -59,12 +59,15 @@ pkg_setup() { $(use_enable ipv6) $(use_enable pulseaudio) $(use_enable !pulseaudio gstmix) - $(use_enable canberra)" + $(use_enable sound canberra)" } src_prepare() { gnome2_src_prepare + # Make it libtool-1 compatible, bug 269548 + rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" + if use gnomecd; then epatch "${FILESDIR}/${P}-missing-cddbslave-cflags.patch" fi diff --git a/gnome-extra/gnome-media/metadata.xml b/gnome-extra/gnome-media/metadata.xml index e3104eb95a7d..911b83df24a3 100644 --- a/gnome-extra/gnome-media/metadata.xml +++ b/gnome-extra/gnome-media/metadata.xml @@ -4,7 +4,7 @@ <herd>gnome</herd> <use> <flag name="gnomecd">Builds the GNOME CD Player</flag> - <flag name="canberra">Adds support for sound notification themes using + <flag name="sound">Adds support for sound notification themes using <pkg>media-libs/libcanberra</pkg></flag> </use> </pkgmetadata> |