Version bump (bug #246787). Thanks to Richard Li <richardpku at gmail dot com>.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 110 insertions, 2 deletions

diff --git a/media-tv/w_scan/ChangeLog b/media-tv/w_scan/ChangeLog
index 3bc55333eca2..802296a11459 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.6 2008/11/20 19:53:21 coldwind Exp $
+
+*w_scan-20081106 (20 Nov 2008)
+
+  20 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/w_scan-20081106-build-and-path-fixes.patch,
+  +w_scan-20081106.ebuild:
+  Version bump (bug #246787). Thanks to Richard Li <richardpku at gmail dot
+  com>.
 
 *w_scan-20080105 (02 Apr 2008)
 
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 033e758a7b79..61402568ef66 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,8 +1,11 @@
 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
+AUX w_scan-20081106-build-and-path-fixes.patch 2397 RMD160 b069b6e40fb1869cb257261ae2652016ceab4e37 SHA1 4552195941df39c33a26540b8ffecd57d67c6a3b SHA256 940588f4010391534820bbd2020ff94cadfe540fdadab7100735f94cbc3a66f2
 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
+DIST w_scan-20081106.tar.bz2 237971 RMD160 42c7f255d8a522ac135b473d26403eeb94cd1d59 SHA1 8c64968feef8ac5e53790c23a52f06e476d4dfae SHA256 73d8e138b310fee721d9fd039759bf0c4eab8b32e54b9e5d43a97b6a5e1e8d72
 EBUILD w_scan-20060903.ebuild 818 RMD160 1eb7909d4290f95e16f06eb9f092ab1f810c8401 SHA1 032353fb7e9d66a56771822d160444512ebe00ab SHA256 4e815f9b534dbbb9e233809fd822f9c05009ae4addead16bec689b00a86e4404
 EBUILD w_scan-20080105.ebuild 834 RMD160 5ba363f7ceff62809c2dd8dad5e4df6fd893db50 SHA1 6b7b5f63789681a6b738474bafad7fc80eaed754 SHA256 0d5041de0310b563dcada4dde444ec49c951db29609e194cfed8f21219ee9dcb
-MISC ChangeLog 1026 RMD160 3a1079053015df3e76b8d049a5762e904ab81c3c SHA1 641fcd246f96ac4a971eaf4104acea8c7c3fc6b4 SHA256 18d07835d6f5d7f908873ee32a2b5e25d3818dfb5c06e8a6266aa6cce96d5ed2
+EBUILD w_scan-20081106.ebuild 834 RMD160 a297a5098b988ad776048860e600c43d67e3ef21 SHA1 e36276828cd27e1d0e3985bf98684b2cbd57ecc5 SHA256 518d495bd1774d2d268c97f724fb46247616f516465624f50148021c1d6146c1
+MISC ChangeLog 1277 RMD160 7edc6266d7e3d2c213efae58701482ac233ef348 SHA1 ada98714127b1f88b4e9c2b4fa9b614d65560c2e SHA256 a97e4af2fb2e2ee1c54430262c29c1f85a7249c4f2bb34253a38050e06339ae9
 MISC metadata.xml 225 RMD160 f21bafc096d303d5336cc842c348655185c84261 SHA1 fa4fdf34ae7126ba6105886cdcbd7931b4e8262b SHA256 dc61ff4127d222ff03fefba3ceed608b69f2d1d4f746fb6769ce6c664a5d44e5
diff --git a/media-tv/w_scan/files/w_scan-20081106-build-and-path-fixes.patch b/media-tv/w_scan/files/w_scan-20081106-build-and-path-fixes.patch
new file mode 100644
index 000000000000..c23d12fa5fa8
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20081106-build-and-path-fixes.patch
@@ -0,0 +1,68 @@
+* Honour CC, CFLAGS, LDFLAGS and DESTDIR.
+* Use absolute paths so it doesn't assume w_scan is ran from the build dir.
+--- w_scan-20081106.orig/Makefile	2008-11-06 08:49:01.000000000 -0600
++++ w_scan-20081106/Makefile	2008-11-07 18:24:20.812221779 -0600
+@@ -1,7 +1,7 @@
+ 
+-CC = gcc
+-CFLAGS = -MD -g -Wall -O2
+-LFLAGS = -g -Wall
++CC ?= gcc
++CFLAGS := -MD -g -Wall -O2 $(CFLAGS)
++LFLAGS := -g -Wall $(LDFLAGS)
+ 
+ OBJS = dump-vdr.o dump-xine.o dump-dvbscan.o dump-kaffeine.o scan.o section.o atsc_psip_section.o
+ SRCS = $(OBJS:.o=.c)
+@@ -10,6 +10,10 @@
+ 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)
+ 	$(RM) *.o *.d
+@@ -17,13 +21,13 @@
+ 	$(CC) $(CFLAGS) --static -c $< -o $@
+ 
+ install:
+-	install -m 755 $(TARGET) /usr/bin
+-	install -m 755 w_scan_start.sh /usr/bin
+-	mkdir -p /usr/share/w_scan
+-	install pci.ids /usr/share/w_scan
+-	install pci.classes /usr/share/w_scan
+-	install usb.ids /usr/share/w_scan
+-	install usb.classes /usr/share/w_scan
++	@mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SHAREDIR) $(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)
+diff -ur w_scan-20081106.orig/w_scan_start.sh w_scan-20081106/w_scan_start.sh
+--- w_scan-20081106.orig/w_scan_start.sh	2008-11-06 09:01:07.000000000 -0600
++++ w_scan-20081106/w_scan_start.sh	2008-11-07 18:24:55.965058963 -0600
+@@ -34,7 +34,7 @@
+ #######################################################
+ 
+ umask 022
+-export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
++export PATH="/usr/share/w_scan:/bin:/usr/bin:/sbin:/usr/sbin"
+ DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
+ W_SCAN=$(which w_scan 2>/dev/null)
+ UDEVSTART=$(which udevstart)
+@@ -712,7 +712,7 @@
+ 			echo "Copying channels.conf skipped - okay."
+ 			echo "The channels.conf generated can be found at"
+ 			echo -n -e "\\033[1;34m"
+-			echo "$(pwd)/channels.conf-$DATE"
++			echo "/usr/share/w_scan/channels.conf-$DATE"
+ 			echo ""
+ 			echo -e -n $NORMAL
+ 		else
diff --git a/media-tv/w_scan/w_scan-20081106.ebuild b/media-tv/w_scan/w_scan-20081106.ebuild
new file mode 100644
index 000000000000..108cdbc1d180
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20081106.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-20081106.ebuild,v 1.1 2008/11/20 19:53:21 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
+}