cleanup, version bump

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 24 insertions, 33 deletions

diff --git a/media-tv/w_scan/ChangeLog b/media-tv/w_scan/ChangeLog
index 5431e1d911c6..8ec92e0fc9d7 100644
--- a/media-tv/w_scan/ChangeLog
+++ b/media-tv/w_scan/ChangeLog
@@ -1,6 +1,15 @@
 # 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.10 2009/05/02 18:28:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/ChangeLog,v 1.11 2009/05/16 15:08:36 hd_brummy Exp $
+
+*w_scan-20090516 (16 May 2009)
+
+  16 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -w_scan-20090502.ebuild,
+  -files/w_scan-20090502-build-and-path-fixes.patch,
+  +w_scan-20090516.ebuild,
+  +files/w_scan-20090516-build-and-path-fixes.patch:
+  cleanup, version bump
 
 *w_scan-20090502 (02 May 2009)
 
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 1c312ece3030..69298bf142d8 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -2,18 +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
+AUX w_scan-20090516-build-and-path-fixes.patch 1389 RMD160 7cd4173816280ca7909b519d721724589bc3a7e1 SHA1 9a6d142fee85474e953f0f1572076e535883aa7d SHA256 24178885a4f0ab6f382ac781936d85c1f71fb95aef67d2baa3ce9c3f3f087699
 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
+DIST w_scan-20090516.tar.bz2 353017 RMD160 52f69de5c3ee93abdb15a3bbb83eeed90a59bc2b SHA1 1ff563265992f4c8b06fc0a6a6a77f1263dffdfe SHA256 1f5ff8a9e6791924d2e81509b7cea946d890a4fe62f9611fee6048b33c3e9fd9
 EBUILD w_scan-20081106.ebuild 829 RMD160 e47b0184e74dc284204d46e37dbf8b49c6eaf231 SHA1 dc3a44591a00ec117368e302375e791a786e096d SHA256 8bb90916acec3ac8b8be6f76a8480ba04debc63d9abfc83af6096288550c4c38
-EBUILD w_scan-20090502.ebuild 1042 RMD160 50b95c027b68392cdb2f2780366f98cba6a1e20e SHA1 ffa9e2e70ef65af215567994cfc6ac2e266c097a SHA256 89be437fd8c8e32cdd84bf5684c579ed669a84cf86072eb8b29404726f15edcc
-MISC ChangeLog 1983 RMD160 c7a516c389ae88caee40a5a104371af8d62b2bb1 SHA1 b09b30a1915b222a134c6c4c3f7af20145e38701 SHA256 60f5c76ad2fdf5c8681f8ea443cab9a00e5e06ae4dae176ab6bf58ccc5eb03cf
+EBUILD w_scan-20090516.ebuild 830 RMD160 597b7649893b744c3bf2d3b48b39badc5803effe SHA1 4f1b1ed09ba02424cdffd758cacd8693905fd954 SHA256 ee2139726bf52709d1e0d4426d6d20c168c54300403767564bd93b0b8b58d049
+MISC ChangeLog 2255 RMD160 77f1d6252ae91990b83030aebe356af42da5cdb7 SHA1 cc6d3e3ea1ef81d07b296b199b2518b5c7bb4d2c SHA256 bdd9e86858b9818c0ffad1efb1a74546e777ce1d4b2a6914b1d849f433a94fac
 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/JDidn07HTTCgIoRAqTcAKCAhNF1e9m8eoOWN+YrTaQQ1IoHxgCeNxBQ
-VGEemrl07UHReiluA7AtiIk=
-=zu7l
+iD8DBQFKDtcSdn07HTTCgIoRAjyOAJwIRtFLiCVwXQZ3fAM/8BDSm0kX5gCeIgDH
+u6Hokf7ioWQXcEiNbUY3N4k=
+=p46a
 -----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-20090516-build-and-path-fixes.patch
index f15aca4ca78b..ebfb58f5aa8a 100644
--- a/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch
+++ b/media-tv/w_scan/files/w_scan-20090516-build-and-path-fixes.patch
@@ -1,20 +1,9 @@
 * 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
+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)
@@ -25,7 +14,7 @@ diff -Naur w_scan-20090502.orig/Makefile w_scan-20090502/Makefile
  $(TARGET): $(OBJS)
  	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
  	$(RM) *.o *.d
-@@ -40,13 +44,13 @@
+@@ -41,14 +44,13 @@
  	echo "" >> version.h
  
  install:
@@ -36,6 +25,7 @@ diff -Naur w_scan-20090502.orig/Makefile w_scan-20090502/Makefile
 -	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)
diff --git a/media-tv/w_scan/w_scan-20090502.ebuild b/media-tv/w_scan/w_scan-20090516.ebuild
index 947292e38b93..530f824a88ed 100644
--- a/media-tv/w_scan/w_scan-20090502.ebuild
+++ b/media-tv/w_scan/w_scan-20090516.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/w_scan/w_scan-20090516.ebuild,v 1.1 2009/05/16 15:08:36 hd_brummy Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,11 +28,3 @@ 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"
-}