Version bump to 20110702. Remove old patches. Fixes bug 322987 and bug 363505.

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

5 files changed, 48 insertions, 112 deletions

diff --git a/media-tv/w_scan/ChangeLog b/media-tv/w_scan/ChangeLog
index a13e3488c102..5b4f1eb8d08d 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.17 2011/01/27 17:55:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.18 2011/09/05 15:49:34 idl0r Exp $
+
+*w_scan-20110702 (05 Sep 2011)
+
+  05 Sep 2011; Christian Ruppert <idl0r@gentoo.org> +w_scan-20110702.ebuild,
+  -files/w_scan-20081106-build-and-path-fixes.patch,
+  -files/w_scan-20090516-build-and-path-fixes.patch, metadata.xml:
+  Version bump to 20110702. Remove old patches. Fixes bug 322987 and bug
+  363505.
 
   27 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   -w_scan-20081106.ebuild, -w_scan-20090516.ebuild, w_scan-20101204.ebuild:
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
deleted file mode 100644
index c23d12fa5fa8..000000000000
--- a/media-tv/w_scan/files/w_scan-20081106-build-and-path-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-* 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/files/w_scan-20090516-build-and-path-fixes.patch b/media-tv/w_scan/files/w_scan-20090516-build-and-path-fixes.patch
deleted file mode 100644
index ebfb58f5aa8a..000000000000
--- a/media-tv/w_scan/files/w_scan-20090516-build-and-path-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-* Honour CC, CFLAGS, LDFLAGS and DESTDIR.
-* Use absolute paths so it doesn't assume w_scan is ran from the build dir.
-* Joerg Bornkessel <hd_brummy@gentoo.org> 2009 May 02
-diff -Naur w_scan-20090516.orig/Makefile w_scan-20090516/Makefile
---- w_scan-20090516.orig/Makefile	2009-05-16 16:58:12.065262724 +0200
-+++ w_scan-20090516/Makefile	2009-05-16 16:59:32.115253677 +0200
-@@ -12,6 +12,9 @@
- OLDVERSION = $(shell sed -n '/SCRIPT_VERSION="/p' w_scan_start.sh | sed -e 's/SCRIPT_VERSION=//' | sed -e 's/;//')
- TMPDIR = w_scan-$(VERSION)
- 
-+BINDIR = /usr/bin
-+SHAREDIR = /usr/share/w_scan
-+
- $(TARGET): $(OBJS)
- 	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
- 	$(RM) *.o *.d
-@@ -41,14 +44,13 @@
- 	echo "" >> version.h
- 
- 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
--	install doc/w_scan.1 /usr/share/man/man1
-+	@mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SHAREDIR)
-+	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: version scriptversion createpackage
- 
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
index 866b19af5188..636266bdd0b2 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/media-tv/w_scan/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-	<email>hd_brummy@gentoo.org</email>
-</maintainer>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>hd_brummy@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/media-tv/w_scan/w_scan-20110702.ebuild b/media-tv/w_scan/w_scan-20110702.ebuild
new file mode 100644
index 000000000000..53e17936afea
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20110702.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/w_scan-20110702.ebuild,v 1.1 2011/09/05 15:49:34 idl0r Exp $
+
+EAPI="2"
+
+DESCRIPTION="Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies and modulations"
+HOMEPAGE="http://wirbel.htpc-forum.de/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="doc examples"
+
+DEPEND="~media-tv/linuxtv-dvb-headers-5"
+RDEPEND=""
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	insinto /usr/share/w_scan
+	doins {pci,usb}.ids {pci,usb}.classes
+
+	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc doc/README.file_formats doc/README_VLC_DVB
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/rotor.conf
+	fi
+}