Removed useless dependency to esound. Deactivated automagic detection of alsa when -alsa USE flag is set. See bug #134725.

Package-Manager: portage-2.0.54-r2

4 files changed, 93 insertions, 11 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index b2c05153bd6f..2718fb445894 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kino
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.36 2006/05/08 17:04:11 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.37 2006/05/29 21:58:12 calchan Exp $
+
+  29 May 2006; Denis Dupeyron <calchan@gentoo.org>
+  +files/kino-0.8.1-alsa.patch, kino-0.8.1.ebuild:
+  Removed useless dependency to esound. Deactivated automagic detection of
+  alsa when -alsa USE flag is set. See bug #134725.
 
 *kino-0.8.1 (08 May 2006)
 
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 5243e3ef9637..dcf0b29295c3 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,4 +1,4 @@
-MD5 16d94ffb888490ac5203e256a01985f0 ChangeLog 4880
+MD5 f2bafa7c23bf283d0fed92ffc398368e ChangeLog 5110
 MD5 30181ed68c1351c7b6eea135e5ee7ad3 files/digest-kino-0.7.5-r1 63
 MD5 2c7645b5cf0d9f0f221fb87ca44b46fe files/digest-kino-0.7.6 63
 MD5 7fd69bf21ef43a535be675250b059cfc files/digest-kino-0.8.0 235
@@ -7,9 +7,10 @@ MD5 3de7378299c687b8b3b8dec40d4f553c files/kino-0.7.5-ppc.diff 8058
 MD5 33d7b5aeacaf3400bbd60f827ca9515b files/kino-0.7.6-configure.diff 913
 MD5 de5e3f7c498faf6447901d9b864c8105 files/kino-0.8.0-configure-in.diff 2558
 MD5 587e070b9cac4ac19524cecdfc2ab60f files/kino-0.8.0-configure.diff 384
+MD5 c03230ec7cd0743552270ebfe6657195 files/kino-0.8.1-alsa.patch 1993
 MD5 2cd366b2db377bd08a4c90c17584714c files/kino-0.8.1-as-needed.patch 891
 MD5 94d6f5306cfe3f5894b93240d6bd4767 kino-0.7.5-r1.ebuild 1310
 MD5 c681bc04ca61db53b8249a7646fa327b kino-0.7.6.ebuild 1358
 MD5 a2bcf7495a490e38d0d6773f88705fdd kino-0.8.0.ebuild 1674
-MD5 e7c4e3d215ebf9eeaef7fa2da15a8f8e kino-0.8.1.ebuild 1464
+MD5 5b68581e52b457372bef9628f5469fc1 kino-0.8.1.ebuild 1517
 MD5 09bd2596b64cb4b2e5fe3cd0d6629059 metadata.xml 327
diff --git a/media-video/kino/files/kino-0.8.1-alsa.patch b/media-video/kino/files/kino-0.8.1-alsa.patch
new file mode 100644
index 000000000000..5652ac6623a6
--- /dev/null
+++ b/media-video/kino/files/kino-0.8.1-alsa.patch
@@ -0,0 +1,74 @@
+diff -Nadurp kino-0.8.1.orig/configure kino-0.8.1/configure
+--- kino-0.8.1.orig/configure	2006-05-29 23:36:07.000000000 +0200
++++ kino-0.8.1/configure	2006-05-29 23:39:58.000000000 +0200
+@@ -22702,68 +22702,9 @@ fi
+ 
+ # ALSA
+ 
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for ALSA" >&5
+-echo $ECHO_N "checking for ALSA... $ECHO_C" >&6
+-
+-if test -n "$PKG_CONFIG"; then
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.9\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.9") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.9" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-else
+-	pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.9\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.9") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.9" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-else
+-	pkg_failed=untried
+-fi
+-
+-if test $pkg_failed = yes; then
+-	ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.9"`
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$ALSA_PKG_ERRORS" 1>&5
+-
+-
+-	{ echo "$as_me:$LINENO: WARNING: $ALSA_PKG_ERRORS" >&5
+-echo "$as_me: WARNING: $ALSA_PKG_ERRORS" >&2;}
+-
+-elif test $pkg_failed = untried; then
+-
+-	{ echo "$as_me:$LINENO: WARNING: $ALSA_PKG_ERRORS" >&5
+-echo "$as_me: WARNING: $ALSA_PKG_ERRORS" >&2;}
+-
+-else
+-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
+-
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALSA 1
+-_ACEOF
+-
++echo "Not using ALSA" >&5
++echo "Not using ALSA" >&6
+ 
+-fi
+ 
+ # LIBQUICKTIME
+ 
diff --git a/media-video/kino/kino-0.8.1.ebuild b/media-video/kino/kino-0.8.1.ebuild
index 4d8f9d64ea7f..a347bfa6ee7d 100644
--- a/media-video/kino/kino-0.8.1.ebuild
+++ b/media-video/kino/kino-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.8.1.ebuild,v 1.1 2006/05/08 17:04:11 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.8.1.ebuild,v 1.2 2006/05/29 21:58:12 calchan Exp $
 
 inherit eutils
 
@@ -10,24 +10,21 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="quicktime dvdr ffmpeg"
-
-# Will use ALSA if alsa-lib>=1.0.9, but I haven't added a USE flag
-# to turn this off explicitly as if you don't want it, don't install it!
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa dvdr ffmpeg quicktime"
 
 DEPEND=">=x11-libs/gtk+-2.6.0
 	>=gnome-base/libglade-2.5.0
 	>=dev-libs/glib-2
 	dev-libs/libxml2
 	media-libs/audiofile
-	media-sound/esound
 	>=sys-libs/libraw1394-1.0.0
 	>=sys-libs/libavc1394-0.4.1
 	>=media-libs/libdv-0.103
 	media-libs/libsamplerate
 	media-video/mjpegtools
 	media-sound/rawrec
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
 	ffmpeg? ( media-video/ffmpeg )
 	quicktime? ( || ( >=media-libs/libquicktime-0.9.5 media-video/cinelerra-cvs ) )
 	dvdr? ( media-video/dvdauthor )"
@@ -39,7 +36,12 @@ src_unpack() {
 	cd ${S}
 
 	# Shameful hack to link with --as-needed
-	epatch ${FILESDIR}/${P}-as-needed.patch
+	epatch ${FILESDIR}/${P}-as-needed.patch || die "epatch failed!"
+
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		epatch ${FILESDIR}/${P}-alsa.patch || die "epatch failed!"
+	fi
 }
 
 src_compile() {