new developer branch

Package-Manager: portage-2.1.6.11/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 101 insertions, 5 deletions

diff --git a/media-tv/w_scan/ChangeLog b/media-tv/w_scan/ChangeLog
index 2e2f2694fc9f..5431e1d911c6 100644
--- a/media-tv/w_scan/ChangeLog
+++ b/media-tv/w_scan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/w_scan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.9 2009/05/02 13:43:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.10 2009/05/02 18:28:38 hd_brummy Exp $
+
+*w_scan-20090502 (02 May 2009)
+
+  02 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +w_scan-20090502.ebuild,
+  +files/w_scan-20090502-build-and-path-fixes.patch:
+  new developer branch
 
   02 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   w_scan-20081106.ebuild, metadata.xml:
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index cbd2ce00adb3..1c312ece3030 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 AUX w_scan-20081106-build-and-path-fixes.patch 2397 RMD160 b069b6e40fb1869cb257261ae2652016ceab4e37 SHA1 4552195941df39c33a26540b8ffecd57d67c6a3b SHA256 940588f4010391534820bbd2020ff94cadfe540fdadab7100735f94cbc3a66f2
+AUX w_scan-20090502-build-and-path-fixes.patch 1670 RMD160 f54f7fa878615a2d9589fa250c70414389269582 SHA1 c848ba0de69489fb652453e7c9ab90a3e322b32c SHA256 da85506a92466e9c76c95815ac1d61bf2cf982d7c8cc0180b049ad5f9968b372
 DIST w_scan-20081106.tar.bz2 237971 RMD160 42c7f255d8a522ac135b473d26403eeb94cd1d59 SHA1 8c64968feef8ac5e53790c23a52f06e476d4dfae SHA256 73d8e138b310fee721d9fd039759bf0c4eab8b32e54b9e5d43a97b6a5e1e8d72
+DIST w_scan-20090502.tar.bz2 346270 RMD160 f6ed10ea80a5a32ec63c561a817f6ce1713bf45b SHA1 4da130bfe475f2fece8595d40b3cb91cca8255c9 SHA256 1d6ad7ffe3b00515f48e3789a37b687b680110de32d8fd1a2a716af0f94299e9
 EBUILD w_scan-20081106.ebuild 829 RMD160 e47b0184e74dc284204d46e37dbf8b49c6eaf231 SHA1 dc3a44591a00ec117368e302375e791a786e096d SHA256 8bb90916acec3ac8b8be6f76a8480ba04debc63d9abfc83af6096288550c4c38
-MISC ChangeLog 1791 RMD160 f34b01488dea6b950fc66f7e4dcc8bea2a10ee58 SHA1 3e0040f1827cdc5bc9b624e30f8fc44ee9555096 SHA256 7a2e62859b7aa7f7d6171993a2f361056a0caf659225e7417b240c124a52ad90
+EBUILD w_scan-20090502.ebuild 1042 RMD160 50b95c027b68392cdb2f2780366f98cba6a1e20e SHA1 ffa9e2e70ef65af215567994cfc6ac2e266c097a SHA256 89be437fd8c8e32cdd84bf5684c579ed669a84cf86072eb8b29404726f15edcc
+MISC ChangeLog 1983 RMD160 c7a516c389ae88caee40a5a104371af8d62b2bb1 SHA1 b09b30a1915b222a134c6c4c3f7af20145e38701 SHA256 60f5c76ad2fdf5c8681f8ea443cab9a00e5e06ae4dae176ab6bf58ccc5eb03cf
 MISC metadata.xml 226 RMD160 6c8edd6adce8f32abf9e1c04025f75306a5cd3e9 SHA1 83f655dad4fee9f553661aa4e1c05eaaa350fd05 SHA256 d2b9d5f7214c075cd3d118e5e9afd8b4fb43893414a2ca182d0a6ad716b56e1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFJ/E4Wdn07HTTCgIoRAiRAAJoDdHY+zyckjWC9kAczadc/NYhvKgCgtN8U
-9OG+yhGIwSc5o/B8y+oXk+U=
-=nd9l
+iD8DBQFJ/JDidn07HTTCgIoRAqTcAKCAhNF1e9m8eoOWN+YrTaQQ1IoHxgCeNxBQ
+VGEemrl07UHReiluA7AtiIk=
+=zu7l
 -----END PGP SIGNATURE-----
diff --git a/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch b/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch
new file mode 100644
index 000000000000..f15aca4ca78b
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch
@@ -0,0 +1,48 @@
+* 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-20090502.orig/Makefile w_scan-20090502/Makefile
+--- w_scan-20090502.orig/Makefile	2009-05-02 15:51:09.203776903 +0200
++++ w_scan-20090502/Makefile	2009-05-02 15:55:27.847392092 +0200
+@@ -1,7 +1,7 @@
+ 
+-CC = gcc
+-CFLAGS = -MD -g -Wall -O2
+-LFLAGS = -g -Wall
++CC ?= gcc
++CFLAGS ?= -MD -g -Wall -O2
++LDFLAGS ?= -g -Wall
+ 
+ OBJS = dump-vdr.o dump-xine.o dump-dvbscan.o dump-kaffeine.o scan.o section.o atsc_psip_section.o countries.o
+ OBJS += dvbscan.o parse-dvbscan.o descriptors.o satellites.o lnb.o diseqc.o
+@@ -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
+@@ -40,13 +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
++	@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/w_scan-20090502.ebuild b/media-tv/w_scan/w_scan-20090502.ebuild
new file mode 100644
index 000000000000..947292e38b93
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20090502.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/w_scan-20090502.ebuild,v 1.1 2009/05/02 18:28:38 hd_brummy Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Scan for DVB-C/DVB-T/DVB-C 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/dev/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-tv/linuxtv-dvb-headers"
+RDEPEND="${DEPEND}
+		>=sys-kernel/linux-headers-2.6.29"
+
+src_prepare() {
+	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
+}
+
+pkg_postinst() {
+	echo
+	elog "This is a new developer branch an need some tests"
+	elog "with different DVB-S Cards, LNB's, diseqc switches ..."
+	echo
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=268320"
+}