public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/
@ 2011-04-04 13:00 Gilles Dartiguelongue
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-04 13:00 UTC (permalink / raw
  To: gentoo-commits

commit:     8a4f548e75f25560cdead94aeefec477d8ba2fc8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 13:00:10 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 13:00:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a4f548e

media-libs/libcanberra: 0.26-r2 → 0.28

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 ...erra-0.26-r2.ebuild => libcanberra-0.28.ebuild} |   31 ++++++++++---------
 media-libs/libcanberra/metadata.xml                |   21 +++++++++++++
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild b/media-libs/libcanberra/libcanberra-0.28.ebuild
similarity index 74%
rename from media-libs/libcanberra/libcanberra-0.26-r2.ebuild
rename to media-libs/libcanberra/libcanberra-0.28.ebuild
index 0b4ebd9..985069e 100644
--- a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.1 2010/06/18 10:11:15 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 inherit gnome2-utils libtool
 
 DESCRIPTION="Portable Sound Event Library"
@@ -12,31 +12,31 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gstreamer +gtk +gtk3 oss pulseaudio +sound tdb"
+IUSE="alsa gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="media-libs/libvorbis
 	>=sys-devel/libtool-2.2.6b
-	alsa? ( media-libs/alsa-lib )
+	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 )
+		gnome-base/gconf:2 )
 	gtk3? ( x11-libs/gtk+:3
-		>=gnome-base/gconf-2 )
+		gnome-base/gconf:2 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	tdb? ( sys-libs/tdb )"
+	tdb? ( sys-libs/tdb )
+"
 RDEPEND="${COMMON_DEPEND}
 	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.17"
 
+REQUIRED_USE="udev? ( alsa )"
+
 src_prepare() {
 	# Run elibtoolize for ~x86-fbsd.
 	use x86-fbsd && elibtoolize
-
-	# Comment out gtk_quit_add which was removed in gtk+:3
-	# Wrong solution, but this is what is used in jhbuild right now
-	# https://bugs.freedesktop.org//show_bug.cgi?id=32839
-	sed -e 's:\(gtk_quit_add\)://\1:' -i "${S}/src/canberra-gtk-module.c" || die
 }
 
 src_configure() {
@@ -50,18 +50,19 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
 		$(use_enable tdb) \
+		$(use_enable udev) \
 		--disable-lynx \
 		--disable-gtk-doc \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 # TODO: check which la files are really needed
 src_install() {
 	# Disable parallel installation until bug #253862 is solved
-	emake -j1 DESTDIR="${ED}" install || die
-	prepalldocs
+	emake -j1 DESTDIR="${D}" install || die
+
+	find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
+	find "${ED}"/usr/$(get_libdir)/gtk-3.0 -name "*.la" -delete
 }
 
 pkg_preinst() { gnome2_gconf_savelist; }

diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
new file mode 100644
index 0000000..b06644f
--- /dev/null
+++ b/media-libs/libcanberra/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>sound</herd>
+<longdescription>A small and lightweight implementation of the XDG Sound Theme Specification (http://0pointer.de/public/sound-theme-spec.html).</longdescription>
+<use>
+  <flag name='alsa'>Enables ALSA sound driver.</flag>
+  <flag name='gstreamer'>Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available.</flag>
+  <flag name='gtk'>Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play
+	utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules
+	in the GTK_MODULES environment variable.</flag>
+  <flag name='gtk3'>Enables building of components for gtk+:3, see gtk USE flag description.</flag>
+  <flag name='pulseaudio'>Enables PulseAudio sound driver that should be able to support positional event sounds.
+	This is the preferred choice for best sound events experience and picked by default if compiled in and
+	possible to use at runtime.</flag>
+  <flag name='sound'>Install x11-themes/sound-theme-freedesktop to get sounds on Gnome and Xfce.</flag>
+  <flag name='tdb'>Enables Trivial Database support for caching purposes.</flag>
+  <flag name='udev'>Enable boot time sound support.</flag>
+</use>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/
@ 2011-04-30  9:04 Nirbheek Chauhan
  0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-04-30  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     96c20f337eacedf9396db868bdb8f5970c404f3a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 21:43:47 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 21:43:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=96c20f33

media-libs/libcanberra: remove ALL la files

* We'll figure out which ones are really needed faster this way

---
 ...erra-0.28.ebuild => libcanberra-0.28-r1.ebuild} |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-libs/libcanberra/libcanberra-0.28.ebuild b/media-libs/libcanberra/libcanberra-0.28-r1.ebuild
similarity index 86%
rename from media-libs/libcanberra/libcanberra-0.28.ebuild
rename to media-libs/libcanberra/libcanberra-0.28-r1.ebuild
index 985069e..9916a4e 100644
--- a/media-libs/libcanberra/libcanberra-0.28.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r1.ebuild
@@ -56,13 +56,15 @@ src_configure() {
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
-# TODO: check which la files are really needed
 src_install() {
 	# Disable parallel installation until bug #253862 is solved
 	emake -j1 DESTDIR="${D}" install || die
 
-	find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
-	find "${ED}"/usr/$(get_libdir)/gtk-3.0 -name "*.la" -delete
+	# TODO: check which la files are really needed
+	#find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
+	#find "${ED}"/usr/$(get_libdir)/gtk-3.0 -name "*.la" -delete
+	# removing ALL of them for now.
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 }
 
 pkg_preinst() { gnome2_gconf_savelist; }



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/
@ 2011-04-30  9:15 Nirbheek Chauhan
  0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-04-30  9:15 UTC (permalink / raw
  To: gentoo-commits

commit:     42570c292424b9334de287beeeff906f1ccbfedd
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 09:13:09 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 09:13:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=42570c29

media-libs/libcanberra: remove only useless la files

* Pointed out by samuli

---
 media-libs/libcanberra/libcanberra-0.28-r1.ebuild |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-libs/libcanberra/libcanberra-0.28-r1.ebuild b/media-libs/libcanberra/libcanberra-0.28-r1.ebuild
index 9916a4e..a32403d 100644
--- a/media-libs/libcanberra/libcanberra-0.28-r1.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r1.ebuild
@@ -60,11 +60,10 @@ src_install() {
 	# Disable parallel installation until bug #253862 is solved
 	emake -j1 DESTDIR="${D}" install || die
 
-	# TODO: check which la files are really needed
-	#find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
-	#find "${ED}"/usr/$(get_libdir)/gtk-3.0 -name "*.la" -delete
-	# removing ALL of them for now.
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+	# Remove useless .la files
+	# la files in /usr/lib*/${P}/ are needed
+	rm -v "${ED}"/usr/$(get_libdir)/gtk-*/modules/*.la || die
+	rm -v "${ED}"/usr/$(get_libdir)/*.la || die
 }
 
 pkg_preinst() { gnome2_gconf_savelist; }



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/
@ 2012-12-19  8:38 Alexandre Rostovtsev
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-19  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     bdfc692df0f9ee8038b9ddd3950d99d679f35e1a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 08:15:08 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 08:15:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bdfc692d

media-libs/libcanberra: moved to gx86

---
 media-libs/libcanberra/libcanberra-0.30.ebuild |   62 ------------------------
 media-libs/libcanberra/metadata.xml            |   32 ------------
 2 files changed, 0 insertions(+), 94 deletions(-)

diff --git a/media-libs/libcanberra/libcanberra-0.30.ebuild b/media-libs/libcanberra/libcanberra-0.30.ebuild
deleted file mode 100644
index 4f7f908..0000000
--- a/media-libs/libcanberra/libcanberra-0.30.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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-160 ) )
-	gstreamer? ( media-libs/gstreamer:1.0 )
-	gtk? (
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-2.20.0:2 )
-	gtk3? (
-		>=dev-libs/glib-2.32:2
-		x11-libs/gtk+:3 )
-	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
-}

diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
deleted file mode 100644
index ee92d3b..0000000
--- a/media-libs/libcanberra/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <herd>sound</herd>
-  <longdescription>
-		A small and lightweight implementation of the XDG Sound Theme Specification
-		(http://0pointer.de/public/sound-theme-spec.html)
-	</longdescription>
-  <use>
-    <flag name="alsa">Enables ALSA sound driver.</flag>
-    <flag name="gstreamer">Enables gstreamer sound driver. Not useful when
-			alsa or pulseaudio is available.</flag>
-    <flag name="gtk">Enables building of gtk+ helper library, gtk+ runtime
-			sound effects and the canberra-gtk-play utility. To enable the gtk+
-			sound effects add canberra-gtk-module to the colon separated list of
-			modules in the GTK_MODULES environment variable.</flag>
-    <flag name="gtk3">Enables building of gtk+3 helper library, gtk+3
-			runtime sound effects and the canberra-gtk-play utility. To enable
-			the gtk+3 sound effects add canberra-gtk-module to the colon
-			separated list of modules in the GTK_MODULES environment
-			variable.</flag>
-    <flag name="pulseaudio">Enables PulseAudio sound driver that should be
-			able to support positional event sounds. This is the preferred
-			choice for best sound events experience and picked by default if
-			compiled in and possible to use at runtime.</flag>
-    <flag name="sound">Install x11-themes/sound-theme-freedesktop to get
-			sounds on Gnome and Xfce.</flag>
-    <flag name="tdb">Enables Trivial Database support for caching
-			purposes.</flag>
-  </use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-12-19  8:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-30  9:04 [gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2012-12-19  8:38 Alexandre Rostovtsev
2011-04-30  9:15 Nirbheek Chauhan
2011-04-04 13:00 Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox