version bump, and switched to use_enable syntax instead. This closes bug #34766 by dju` <dju@elegiac.net>, with ebuilds and patches provided by: TGL <degrenier@easyconnect.fr>

7 files changed, 135 insertions, 63 deletions

diff --git a/media-tv/xawdecode/ChangeLog b/media-tv/xawdecode/ChangeLog
index a61b36a335e8..464ace356061 100644
--- a/media-tv/xawdecode/ChangeLog
+++ b/media-tv/xawdecode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/xawdecode
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/ChangeLog,v 1.7 2003/11/06 09:13:24 seemant Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/ChangeLog,v 1.8 2004/01/22 06:43:00 seemant Exp $
+
+*xawdecode-1.8.2 (21 Jan 2004)
+
+  21 Jan 2004; Seemant Kulleen <seemant@gentoo.org> xawdecode-1.8.0.ebuild,
+  xawdecode-1.8.1.ebuild, xawdecode-1.8.2.ebuild,
+  files/xawdecode-1.8.2-configure-alsa-fixes.patch:
+  version bump, and switched to use_enable syntax instead. This closes bug
+  #34766 by dju` <dju@elegiac.net>, with ebuilds and patches provided by: TGL
+  <degrenier@easyconnect.fr>
 
 *xawdecode-1.8.1 (06 Nov 2003)
 
diff --git a/media-tv/xawdecode/Manifest b/media-tv/xawdecode/Manifest
index 95e5dd461e2d..eb6a74c0bb8d 100644
--- a/media-tv/xawdecode/Manifest
+++ b/media-tv/xawdecode/Manifest
@@ -1,7 +1,9 @@
 MD5 df23c77924e53e2e9492cd07cf339fec xawdecode-1.8.1.ebuild 2380
 MD5 68befdc9d120f13557fd3fcc46bedd6d xawdecode-1.8.0.ebuild 2336
+MD5 fedab4f4f8b5b3fdc06e30774e85ccff xawdecode-1.8.2.ebuild 2324
 MD5 c3654721ee05ff8d51e965d4429d8508 ChangeLog 1950
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 66af1f2572bcb65fe72df4563d6b9d10 files/xawdecode.desktop 404
 MD5 2d1f68c259c3e5cde78d3e8a04134699 files/digest-xawdecode-1.8.0 68
 MD5 8c9ac25ba785fa959627de0c9f2eba70 files/digest-xawdecode-1.8.1 68
+MD5 9409b3e8db5d9d0490cd787a70f27c39 files/digest-xawdecode-1.8.2 68
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.8.1 b/media-tv/xawdecode/files/digest-xawdecode-1.8.1
deleted file mode 100644
index 4cd1a6c54f78..000000000000
--- a/media-tv/xawdecode/files/digest-xawdecode-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46b93fec8178981687f9da0dffed1da2 xawdecode-1.8.1.tar.bz2 458635
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.8.2 b/media-tv/xawdecode/files/digest-xawdecode-1.8.2
new file mode 100644
index 000000000000..943c08680750
--- /dev/null
+++ b/media-tv/xawdecode/files/digest-xawdecode-1.8.2
@@ -0,0 +1 @@
+MD5 a7ecff1661dd51383b3d82d1c893ba57 xawdecode-1.8.2.tar.bz2 465009
diff --git a/media-tv/xawdecode/files/xawdecode-1.8.2-configure-alsa-fixes.patch b/media-tv/xawdecode/files/xawdecode-1.8.2-configure-alsa-fixes.patch
new file mode 100644
index 000000000000..606af7cab434
--- /dev/null
+++ b/media-tv/xawdecode/files/xawdecode-1.8.2-configure-alsa-fixes.patch
@@ -0,0 +1,83 @@
+--- configure.orig	2004-01-07 17:47:46.322558032 +0100
++++ configure	2004-01-07 17:58:38.759564632 +0100
+@@ -3575,7 +3575,7 @@
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   case "$host_os" in
+   rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
+     ;;
+   *) # Darwin 1.3 on
+     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+@@ -9713,15 +9713,15 @@
+ if test -r /proc/cpuinfo ; then
+     # Linux with /proc mounted, extract CPU information from it
+     _cpuinfo="cat /proc/cpuinfo"
+-  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
+-  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
+-  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+-  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+-  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
++  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1`
++  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1`
++  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
++  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
++  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
+ 
+-  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
++  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n 1`
+   if test -z "$pparam" ; then
+-    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
++    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1`
+   fi
+ 
+   _mmx=no
+@@ -12640,7 +12640,7 @@
+ if test "$enable_alsa" != "no"; then
+     check_alsa_version=no
+ 
+-    # snd_pcm_readi is only 0.9.x (?)
++    # snd_pcm_readi is only 0.9.x / 1.0.x (?)
+     echo "$as_me:$LINENO: checking for snd_pcm_readi in -lasound" >&5
+ echo $ECHO_N "checking for snd_pcm_readi in -lasound... $ECHO_C" >&6
+ if test "${ac_cv_lib_asound_snd_pcm_readi+set}" = set; then
+@@ -12706,8 +12706,8 @@
+     if test "$check_alsa_version" = "yes"; then
+ 
+       asoundlib="none"
+-      echo "$as_me:$LINENO: checking for alsa 0.9 with alsa/asoundlib.h" >&5
+-echo $ECHO_N "checking for alsa 0.9 with alsa/asoundlib.h... $ECHO_C" >&6
++      echo "$as_me:$LINENO: checking for alsa 0.9.x or 1.0.x with alsa/asoundlib.h" >&5
++echo $ECHO_N "checking for alsa 0.9.x or 1.0.x with alsa/asoundlib.h... $ECHO_C" >&6
+       if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -12724,7 +12724,7 @@
+ /* end confdefs.h.  */
+ 
+       #include <alsa/asoundlib.h>
+-      int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
++      int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); }
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -12766,8 +12766,8 @@
+ fi
+ 
+       if test "$asoundlib" != "alsa"; then
+-        echo "$as_me:$LINENO: checking for alsa 0.9 with sys/asoundlib.h" >&5
+-echo $ECHO_N "checking for alsa 0.9 with sys/asoundlib.h... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for alsa 0.9.x or 1.0.x with sys/asoundlib.h" >&5
++echo $ECHO_N "checking for alsa 0.9.x or 1.0.x with sys/asoundlib.h... $ECHO_C" >&6
+         if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -12784,7 +12784,7 @@
+ /* end confdefs.h.  */
+ 
+         #include <sys/asoundlib.h>
+-        int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
++        int main(void) { return (!((SND_LIB_MAJOR==0 && SND_LIB_MINOR==9) || (SND_LIB_MAJOR == 1))); }
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
diff --git a/media-tv/xawdecode/xawdecode-1.8.0.ebuild b/media-tv/xawdecode/xawdecode-1.8.0.ebuild
index 100081de82a2..c9b90ed07aa4 100644
--- a/media-tv/xawdecode/xawdecode-1.8.0.ebuild
+++ b/media-tv/xawdecode/xawdecode-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.8.0.ebuild,v 1.5 2003/10/29 00:36:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.8.0.ebuild,v 1.6 2004/01/22 06:43:00 seemant Exp $
 
 IUSE="alsa jpeg encode ffmpeg xvid lirc xosd"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ~ppc ~sparc"
 
 RDEPEND="virtual/x11
 	>=media-libs/zvbi-0.2.4
@@ -31,35 +31,18 @@ DEPEND="${RDEPEND}
 src_compile() {
 	local myconf
 
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use lirc \
-		&& myconf="${myconf} --enable-lirc" \
-		|| myconf="${myconf} --disable-lirc"
-
 	use x86 \
 		&& myconf="${myconf} --enable-divx4linux" \
 		|| myconf="${myconf} --disable-divx4linux"
 
-	use ffmpeg \
-		&& myconf="${myconf} --enable-ffmpeg" \
-		|| myconf="${myconf} --disable-ffmpeg"
-
-	use xvid \
-		&& myconf="${myconf} --enable-xvid" \
-		|| myconf="${myconf} --disable-xvid"
-
-	use xosd \
-		&& myconf="${myconf} --enable-xosd" \
-		|| myconf="${myconf} --disable-xosd"
-
-	econf ${myconf} || die "Configuration failed."
+	econf \
+		`use_enable alsa` \
+		`use_enable jpeg` \
+		`use_enable lirc` \
+		`use_enable ffmpeg` \
+		`use_enable xvid` \
+		`use_enable xosd` \
+		${myconf} || die "Configuration failed."
 
 	emake PERF_FLAGS="${CFLAGS}" || die "Compilation failed."
 	# Or should we keep the optimized flags they suggest?
diff --git a/media-tv/xawdecode/xawdecode-1.8.1.ebuild b/media-tv/xawdecode/xawdecode-1.8.2.ebuild
index eb3f1ea6bf32..e4c9c142120d 100644
--- a/media-tv/xawdecode/xawdecode-1.8.1.ebuild
+++ b/media-tv/xawdecode/xawdecode-1.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.8.1.ebuild,v 1.1 2003/11/06 09:13:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.8.2.ebuild,v 1.1 2004/01/22 06:43:00 seemant Exp $
 
 IUSE="alsa jpeg encode ffmpeg xvid lirc xosd"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="virtual/x11
 	>=media-libs/zvbi-0.2.4
@@ -22,46 +22,35 @@ RDEPEND="virtual/x11
 	encode? ( >=media-sound/lame-3.93 )
 	jpeg? ( media-libs/jpeg )
 	lirc? ( app-misc/lirc )
-	alsa? ( media-libs/alsa-lib media-sound/alsa-utils )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
 	xosd? ( >=x11-libs/xosd-2.2.2 )"
 
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-configure-alsa-fixes.patch
+}
+
 src_compile() {
 	local myconf
 
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use lirc \
-		&& myconf="${myconf} --enable-lirc" \
-		|| myconf="${myconf} --disable-lirc"
-
 	use x86 \
 		&& myconf="${myconf} --enable-divx4linux" \
 		|| myconf="${myconf} --disable-divx4linux"
 
-	use ffmpeg \
-		&& myconf="${myconf} --enable-ffmpeg" \
-		|| myconf="${myconf} --disable-ffmpeg"
-
-	use xvid \
-		&& myconf="${myconf} --enable-xvid" \
-		|| myconf="${myconf} --disable-xvid"
-
-	use xosd \
-		&& myconf="${myconf} --enable-xosd" \
-		|| myconf="${myconf} --disable-xosd"
-
-	econf ${myconf} || die "Configuration failed."
+	econf \
+		`use_enable alsa` \
+		`use_enable jpeg` \
+		`use_enable lirc` \
+		`use_enable ffmpeg` \
+		`use_enable xvid` \
+		`use_enable xosd` \
+		${myconf} || die "Configuration failed."
 
-	emake || die
+	emake || die "Compilation failed."
 }
 
 src_install() {
@@ -85,11 +74,17 @@ src_install() {
 }
 
 pkg_postinst() {
-	mkfontdir /usr/X11R6/lib/X11/fonts/misc > /dev/null 2>&1
+	if [ "${ROOT}" = "/" ]
+	then
+		mkfontdir /usr/X11R6/lib/X11/fonts/misc > /dev/null 2>&1
+	fi
 	einfo "Please note that this ebuild created a suid-binary:"
 	einfo "/usr/bin/xawdecode_v4l-conf"
 }
 
 pkg_postrm() {
-	mkfontdir /usr/X11R6/lib/X11/fonts/misc > /dev/null 2>&1
+	if [ "${ROOT}" = "/" ]
+	then
+		mkfontdir /usr/X11R6/lib/X11/fonts/misc > /dev/null 2>&1
+	fi
 }