Version bump wrt bug #215761, fixed paths and honour CFLAGS, LDFLAGS and CC. Add me as maintainer.

Package-Manager: portage-2.1.4.4

5 files changed, 163 insertions, 5 deletions

diff --git a/media-tv/w_scan/ChangeLog b/media-tv/w_scan/ChangeLog
index 37af8936c8a5..3bc55333eca2 100644
--- a/media-tv/w_scan/ChangeLog
+++ b/media-tv/w_scan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/w_scan
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.4 2007/03/13 12:00:42 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.5 2008/04/02 14:38:55 coldwind Exp $
+
+*w_scan-20080105 (02 Apr 2008)
+
+  02 Apr 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/w_scan-20080105-build-and-path-fixes.patch, metadata.xml,
+  +w_scan-20080105.ebuild:
+  Version bump wrt bug #215761, fixed paths and honour CFLAGS, LDFLAGS and
+  CC.
 
   13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org> w_scan-20060903.ebuild:
   Marked stable on x86.
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index ee955f8a43ef..033e758a7b79 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,5 +1,8 @@
 AUX w_scan-20060903-paths.patch 3375 RMD160 da2977020157f8cfaba40025cc7cbbc6965c711c SHA1 fefc34e4d9aaf5614715af681cd24a8d5873bb17 SHA256 6a48fbe123672f86040d843f2362f7d21bcdf76f71ce9a43ad2f811ac0acf761
+AUX w_scan-20080105-build-and-path-fixes.patch 3564 RMD160 b470b5f75588643a14b01eefbf0a9ffca345de28 SHA1 5e7a4c955526c9461ea0709c2b6a0f61752611c8 SHA256 5b04ac7399b3f40608c852a59133419d3910f9f35bc495b2801bbe4c195636ca
 DIST w_scan-20060903.tar.bz2 211285 RMD160 cb67c818bf79224de0c0f274438854c45d3b33d3 SHA1 7f2525c1d195a5fd01cbaa24484844e0c810622f SHA256 e465da985928d48fcbbedb84582f19a34c141e0d567cdd70b27f3ab0ca496dd8
+DIST w_scan-20080105.tar.bz2 220579 RMD160 b3196206ace1d3e6a0b0565e740e95f594aef5b4 SHA1 6b5368cce31d3ca6ef5b765e26d379ec058cf1b8 SHA256 851ada49955d9e83fd53d1d5887445a1872babb402ccc134031e84579c4544e7
 EBUILD w_scan-20060903.ebuild 818 RMD160 1eb7909d4290f95e16f06eb9f092ab1f810c8401 SHA1 032353fb7e9d66a56771822d160444512ebe00ab SHA256 4e815f9b534dbbb9e233809fd822f9c05009ae4addead16bec689b00a86e4404
-MISC ChangeLog 760 RMD160 4f1a27815102d483105ef6c02da9f8bac66e6c88 SHA1 6ef39cae02a7f79205eb176c2f1c9e9b8a547af5 SHA256 73b9fbddd4f67bda57e32441e5bc1d82387dcdc72329d11a761aa4b84aa0995d
-MISC metadata.xml 224 RMD160 b7fe9a2329e1993779f819f5585cfe4b7cdd2195 SHA1 ed45713d70384ccf25cb8a6cadb7a9a01ae2e49e SHA256 f8538776bbe23f11aa2cba3df2cb23192643900d44dcfebc69dcb556d140335c
+EBUILD w_scan-20080105.ebuild 834 RMD160 5ba363f7ceff62809c2dd8dad5e4df6fd893db50 SHA1 6b7b5f63789681a6b738474bafad7fc80eaed754 SHA256 0d5041de0310b563dcada4dde444ec49c951db29609e194cfed8f21219ee9dcb
+MISC ChangeLog 1026 RMD160 3a1079053015df3e76b8d049a5762e904ab81c3c SHA1 641fcd246f96ac4a971eaf4104acea8c7c3fc6b4 SHA256 18d07835d6f5d7f908873ee32a2b5e25d3818dfb5c06e8a6266aa6cce96d5ed2
+MISC metadata.xml 225 RMD160 f21bafc096d303d5336cc842c348655185c84261 SHA1 fa4fdf34ae7126ba6105886cdcbd7931b4e8262b SHA256 dc61ff4127d222ff03fefba3ceed608b69f2d1d4f746fb6769ce6c664a5d44e5
diff --git a/media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch b/media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch
new file mode 100644
index 000000000000..b688fcfe3f9c
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch
@@ -0,0 +1,118 @@
+diff -ur w_scan-20080105.orig/Makefile w_scan-20080105/Makefile
+--- w_scan-20080105.orig/Makefile	2008-04-02 16:02:00.000000000 +0200
++++ w_scan-20080105/Makefile	2008-04-02 16:28:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ 
+-CC = gcc
+-CFLAGS = -MD -g -Wall -O2
+-LFLAGS = -g -Wall
++CC ?= gcc
++ALL_CFLAGS = -MD -g -Wall -O2 $(CFLAGS)
++ALL_LDFLAGS = -g -Wall $(LDFLAGS)
+ 
+ OBJS = dump-vdr.o dump-xine.o dump-dvbscan.o dump-kaffeine.o scan.o
+ SRCS = $(OBJS:.o=.c)
+@@ -10,19 +10,26 @@
+ VERSION = $(shell sed -n '/uint version/p' scan.c | sed -e 's/uint version = //' | sed -e 's/;//')
+ TMPDIR = w_scan-$(VERSION)
+ 
++BINDIR = /usr/bin
++SHAREDIR = /usr/share/w_scan
++DOCDIR = /usr/share/doc/w_scan
++
+ $(TARGET): $(OBJS)
+-	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
++	$(CC) $(ALL_LDFLAGS) -o $(TARGET) $(OBJS)
+ 	$(RM) *.o *.d
+ .c.o:
+-	$(CC) $(CFLAGS) --static -c $< -o $@
++	$(CC) $(ALL_CFLAGS) -c $< -o $@
+ 
+ install:
+-	install -m 755 $(TARGET) /usr/bin
+-	install -m 755 w_scan_start.sh /usr/bin
+-	install pci.ids /usr/bin
+-	install pci.classes /usr/bin
+-	install usb.ids /usr/bin
+-	install usb.classes /usr/bin
++	@mkdir -p $(DESTDIR)$(BINDIR)
++	@mkdir -p $(DESTDIR)$(SHAREDIR)
++	@mkdir -p $(DESTDIR)$(DOCDIR)
++	install -m 755 $(TARGET) $(DESTDIR)$(BINDIR)
++	install -m 755 w_scan_start.sh $(DESTDIR)$(BINDIR)
++	install pci.ids $(DESTDIR)$(SHAREDIR)
++	install pci.classes $(DESTDIR)$(SHAREDIR)
++	install usb.ids $(DESTDIR)$(SHAREDIR)
++	install usb.classes $(DESTDIR)$(SHAREDIR)
+ 
+ dist:
+ 	@-rm -rf $(TMPDIR)
+Los ficheros w_scan-20080105.orig/w_scan y w_scan-20080105/w_scan son distintos
+diff -ur w_scan-20080105.orig/w_scan_start.sh w_scan-20080105/w_scan_start.sh
+--- w_scan-20080105.orig/w_scan_start.sh	2008-04-02 16:02:00.000000000 +0200
++++ w_scan-20080105/w_scan_start.sh	2008-04-02 16:27:55.000000000 +0200
+@@ -414,8 +414,8 @@
+ 	  read idVendor < $i/idVendor
+ 	  read idProduct < $i/idProduct
+ 	  # avoid errors if ressource not available
+-	  if	[ ! -e $(pwd)/usb.ids ] ||
+-		[ ! -e $(pwd)/usb.classes ]; then
++	  if	[ ! -e /usr/share/w_scan/usb.ids ] ||
++		[ ! -e /usr/share/w_scan/usb.classes ]; then
+ 	    DEBUG_LOADDRIVER=false
+ 	  fi
+ 	  if [ $DEBUG_LOADDRIVER == true ]; then
+@@ -424,7 +424,7 @@
+ 		    class_name=${line:6:40}
+ 		    break
+ 		  fi
+-		done < $(pwd)/usb.classes
++		done < /usr/share/w_scan/usb.classes
+ 		while read line; do
+ 		  if [ "${line:0:4}" == "$idVendor" ]; then
+ 		    vendor_name=${line:6:80}
+@@ -438,7 +438,7 @@
+ 		    done		
+ 		    break
+ 		  fi
+-		done < $(pwd)/usb.ids
++		done < /usr/share/w_scan/usb.ids
+ 	  fi
+ 	  while read line; do
+ 	    data=$line
+@@ -507,8 +507,8 @@
+ 	  read subvendor < $i/subsystem_vendor
+ 	  read subdevice < $i/subsystem_device
+ 	  # avoid errors if ressource not available
+-	  if	[ ! -e $(pwd)/pci.ids ] ||
+-		[ ! -e $(pwd)/pci.classes ]; then
++	  if	[ ! -e /usr/share/w_scan/pci.ids ] ||
++		[ ! -e /usr/share/w_scan/pci.classes ]; then
+ 	    DEBUG_LOADDRIVER=false
+ 	  fi
+ 	  if [ $DEBUG_LOADDRIVER == true ]; then
+@@ -517,7 +517,7 @@
+ 		  class_name=${line:5:40}
+ 		  break
+ 		  fi
+-		done < $(pwd)/pci.classes
++		done < /usr/share/w_scan/pci.classes
+ 		while read line; do
+ 		  if [ "${line:0:4}" == "${vendor:2:4}" ]; then
+ 		  vendor_name=${line:5:80}
+@@ -531,13 +531,13 @@
+ 		  done		
+ 		  break
+ 		  fi
+-		done < $(pwd)/pci.ids
++		done < /usr/share/w_scan/pci.ids
+ 		while read line; do
+ 		  if [ "${line:0:4}" == "${subvendor:2:4}" ]; then
+ 		    subvendor_name=${line:5:80}
+ 		    break
+ 		  fi
+-		done < $(pwd)/pci.ids
++		done < /usr/share/w_scan/pci.ids
+ 	  fi
+ 	  while read line; do
+ 	    data=$line
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
index c957466cfa5f..3dee80576fe9 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/media-tv/w_scan/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>media-tv</herd>
 <maintainer>
-<email>media-tv@gentoo.org</email>
+	<email>coldwind@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
 
diff --git a/media-tv/w_scan/w_scan-20080105.ebuild b/media-tv/w_scan/w_scan-20080105.ebuild
new file mode 100644
index 000000000000..2e57f9cb5a63
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20080105.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/w_scan-20080105.ebuild,v 1.1 2008/04/02 14:38:55 coldwind Exp $
+
+inherit eutils
+
+DESCRIPTION="Scan for DVB-C/DVB-T channels without prior knowledge of frequencies and modulations - can also create a file in vdr-format"
+HOMEPAGE="http://free.pages.at/wirbel4vdr/w_scan/index2.html"
+SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-tv/linuxtv-dvb-headers"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build-and-path-fixes.patch"
+	emake clean || die "emake clean failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc README
+}