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

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

6 files changed, 61 insertions, 122 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/Manifest b/media-tv/w_scan/Manifest
index d4719e4048cf..8b494dc94223 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX w_scan-20081106-build-and-path-fixes.patch 2397 RMD160 b069b6e40fb1869cb257261ae2652016ceab4e37 SHA1 4552195941df39c33a26540b8ffecd57d67c6a3b SHA256 940588f4010391534820bbd2020ff94cadfe540fdadab7100735f94cbc3a66f2
-AUX w_scan-20090516-build-and-path-fixes.patch 1389 RMD160 7cd4173816280ca7909b519d721724589bc3a7e1 SHA1 9a6d142fee85474e953f0f1572076e535883aa7d SHA256 24178885a4f0ab6f382ac781936d85c1f71fb95aef67d2baa3ce9c3f3f087699
 DIST w_scan-20090918.tar.bz2 416000 RMD160 7ed4af038ebffd735ad49413b398c279f7cf9043 SHA1 44a0888c5cfa6d9539037d2a795fd42d7a2fa378 SHA256 68a6b657ac86e51238aac000a124b66104daed702fb6c996804498127ff1156d
 DIST w_scan-20101204.tar.bz2 453846 RMD160 99a80c9fb574a3f9a32488a8b7b8c601be8dcf2a SHA1 7bff2d9da29450d5012131ab768a8895e4fcfe23 SHA256 1731a17317a75f9c37732654c10070acf4058b70757f762de8be05d8f5fcf838
+DIST w_scan-20110702.tar.bz2 484197 RMD160 f149d30d2f5f5fa28006039b9528b4dfd5c1505d SHA1 8ed89bb91b9f751495cbb9140147b2a4cf06d474 SHA256 5d6a4aa9814ee37c93792707db73d47eace5a6c07d1df7aac802304f3d012771
 EBUILD w_scan-20090918.ebuild 748 RMD160 9330f46324127b4151c8474d10e8574ce3c9b4b0 SHA1 fd9482ec5424c4e483e1d502ca9135e1e6782204 SHA256 dc633d26d62e6e185fa642d1524903ffb0397f90a55bef6a80235a5acc450cc2
 EBUILD w_scan-20101204.ebuild 748 RMD160 1773f836b30135d3d4aa450a059ee43091c62ec2 SHA1 53f8e3b8d0fc9560607c9502d5ee49d17231d481 SHA256 f602c2f9dcc364acd197dd7570573b4e33ae26e8f420b05ec7d5517829a09e40
-MISC ChangeLog 3130 RMD160 d6de0c64fdc7dfbe8d25accc84063f1d1b366c2b SHA1 3f7f97166f0b60f0fff83a881acfe094982333fd SHA256 01ec900eaf2f39198c9e5b255b2723f4dbd7fea1a6366d5bd6004c99c8898d86
-MISC metadata.xml 226 RMD160 6c8edd6adce8f32abf9e1c04025f75306a5cd3e9 SHA1 83f655dad4fee9f553661aa4e1c05eaaa350fd05 SHA256 d2b9d5f7214c075cd3d118e5e9afd8b4fb43893414a2ca182d0a6ad716b56e1b
+EBUILD w_scan-20110702.ebuild 888 RMD160 879c81d285ba3ca4e795d0b2d5882c9476e4bdd5 SHA1 d89d5db444a2b5591f585dfe0fcac67252d150df SHA256 f57e64978582eab7ce6da8382ae976fb7522e1f03ec16e9502619f9bf0402066
+MISC ChangeLog 3439 RMD160 f53adbc20d03a427a8b8df4c9123036e4403b5ed SHA1 cca2ad3a522aa7f0e7d13d2b4e8cc725b3720115 SHA256 4d88ac5efdd147b7f9d6c8ec6a24b6a21c5c5b71c277e321512aa0ffa5abc3f1
+MISC metadata.xml 229 RMD160 495f6d05f88a9014d24042dd15ad254d4b688f3c SHA1 cc85e8289cee81db0e989a8ada2d148205cf1da4 SHA256 10141292bb8979d1efb1987937163e675bd90760c291e3caffb769619b23b525
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNQbGrdn07HTTCgIoRAk2zAKCfgw/dUisKFsmaEfn3zYrPqOG09wCfWf4v
-nkYk3QmHJe9CWjO+9uoq3Jw=
-=wU13
+iQEcBAEBCAAGBQJOZO+TAAoJEMOx0zmdw4Z1nN0H/31wDDVPkpbQMHSiCT276j2o
+dcA0+n++3vafTKdJQo2iE1HOIg4DIEGtu4YPjUYzKlKQ3otMKGNS0aCiw9pvq5Wt
+ppctKukAJy+68ipH1MZ+hJKGE2JFIb0CerI0xj4XO9YTzGgy3+IF5QaO9+tqtVuO
+VU7OmIvUeX7nNqQa+tzZtMRmmC28h+QR4bskDV5ftk7XKs39OOKaLuuBqwJMhdLR
+RSP5/4c/HgcWdmar3wyzYSWGGEFO1kohy+0s+TgACcu8RhvYvxiKm0CCqcn2CASv
+iK+YGAyRHFI5DjIYE8ELR9ah2a/dCUlGAZTGJk/0NiLTy70frSAlrEZyNEF84zc=
+=tsXm
 -----END PGP SIGNATURE-----
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
+}