diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libcanberra/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libcanberra/libcanberra-0.28-r5.ebuild | 86 | ||||
-rw-r--r-- | media-libs/libcanberra/libcanberra-0.29.ebuild | 4 |
3 files changed, 7 insertions, 89 deletions
diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog index 14290dd6931d..7da7450603ba 100644 --- a/media-libs/libcanberra/ChangeLog +++ b/media-libs/libcanberra/ChangeLog @@ -1,6 +1,10 @@ # 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.92 2012/10/28 16:03:20 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.93 2012/11/17 12:18:56 pacho Exp $ + + 17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.28-r5.ebuild, + libcanberra-0.29.ebuild: + Disable silent rules, #443132 by ago. 28 Oct 2012; Raúl Porcel <armin76@gentoo.org> libcanberra-0.29.ebuild: ia64/sh/sparc stable wrt #427544 diff --git a/media-libs/libcanberra/libcanberra-0.28-r5.ebuild b/media-libs/libcanberra/libcanberra-0.28-r5.ebuild deleted file mode 100644 index 01fdbb5f9cb3..000000000000 --- a/media-libs/libcanberra/libcanberra-0.28-r5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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.28-r5.ebuild,v 1.10 2012/06/02 12:21:29 blueness Exp $ - -EAPI="4" - -inherit gnome2-utils libtool systemd autotools eutils - -DESCRIPTION="Portable Sound Event Library" -HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/" -SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -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? ( >=sys-fs/udev-160 ) ) - gstreamer? ( >=media-libs/gstreamer-0.10.15 ) - gtk? ( >=x11-libs/gtk+-2.20.0:2 - gnome-base/gconf:2 ) - gtk3? ( x11-libs/gtk+:3 - gnome-base/gconf:2 ) - 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} - virtual/pkgconfig" - -REQUIRED_USE="udev? ( alsa )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-underlinking.patch - - # https://bugs.freedesktop.org/show_bug.cgi?id=35024 - epatch "${FILESDIR}/${PN}-0.28-workaround-hang.patch" - - # gconf-2.m4 is needed for autoconf, bug #374561 - if ! use gtk && ! use gtk3 ; then - cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!" - fi - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - $(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 \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - # Disable parallel installation until bug #253862 is solved - emake -j1 DESTDIR="${D}" install - - # Remove useless .la files: - # libcanberra uses lt_dlopenext instead of ld_dlopen to load the modules, - # which means that it will first try appending ".la" to the given filename - # prefix; if that fails, it will append the module extension for the - # current system and try that (".so" on Linux, ".bundle" on Darwin, ".dll" - # on Windows, etc.). Only if both fail will it return an error. - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" -} - -pkg_preinst() { gnome2_gconf_savelist; } -pkg_postinst() { gnome2_gconf_install; } diff --git a/media-libs/libcanberra/libcanberra-0.29.ebuild b/media-libs/libcanberra/libcanberra-0.29.ebuild index ef27515e68eb..f450a7c1aaec 100644 --- a/media-libs/libcanberra/libcanberra-0.29.ebuild +++ b/media-libs/libcanberra/libcanberra-0.29.ebuild @@ -1,6 +1,6 @@ # 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.10 2012/10/28 16:03:20 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.11 2012/11/17 12:18:56 pacho Exp $ EAPI="4" @@ -45,7 +45,7 @@ src_prepare() { src_configure() { econf \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --disable-dependency-tracking \ + --disable-silent-rules \ $(use_enable alsa) \ $(use_enable oss) \ $(use_enable pulseaudio pulse) \ |