Updated to latest upstream, new homepage, fixed make variables.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 32 insertions, 19 deletions

diff --git a/media-video/sonic-snap/ChangeLog b/media-video/sonic-snap/ChangeLog
index 5bb9d21fc24d..669796c7a996 100644
--- a/media-video/sonic-snap/ChangeLog
+++ b/media-video/sonic-snap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/sonic-snap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.8 2009/08/31 22:29:46 ikelos Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.9 2011/03/14 01:16:31 nerdboy Exp $
+
+*sonic-snap-1.7 (14 Mar 2011)
+
+  14 Mar 2011; Steve Arnold <nerdboy@gentoo.org> -sonic-snap-1.5.ebuild,
+  +sonic-snap-1.7.ebuild:
+  Updated to latest upstream, new homepage, fixed make variables. Closes
+  bug #337190.
 
   31 Aug 2009; Mike Auty <ikelos@gentoo.org> sonic-snap-1.5.ebuild:
   Making CONFIG_CHECK non-fatal for userland ebuilds, see bug 283320.
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
index e767dd0fb597..6e2b7d6d07fd 100644
--- a/media-video/sonic-snap/Manifest
+++ b/media-video/sonic-snap/Manifest
@@ -1,4 +1,4 @@
-DIST sonic-snap-1.5.tar.gz 16018 RMD160 4f0b57fabb35cf4ef993bcc60f6bc69b0f894599 SHA1 83cf81d67ee9ccfe159433a5e5877953d2fac79a SHA256 884f7396f4a1f3848513272a363c1d40bd01b56e383250ea2c87ba0873ab7d5d
-EBUILD sonic-snap-1.5.ebuild 1606 RMD160 eb2e139a016c163b3f2f79aa1be90adcc608e189 SHA1 47593eea2e4328b2787ef8b3f904e438de71e0f6 SHA256 622902aeef7033f5cf040145b931de0b783d428b2307019c6f31107fb3a0ef3b
-MISC ChangeLog 1345 RMD160 35785d3083160e8caa4688868678b05e7d432976 SHA1 e8136d83ed1ea84a0387f518e467a9a8f9b6b33e SHA256 ba3c974f1bf0b811c3b89fb35a4b1640227893caf366e6f861ac20d91dc97095
+DIST sonic-snap-1.7.tar.gz 16760 RMD160 ff1f69013582385aa93572858876d8516dc82537 SHA1 09251c39e8ed8bc8a51a7520b5148a6d7ad00edd SHA256 013a1f480d2f205caa2d2ceb8fe82e2af9ed6c86ecca4124760322e4b3dd9e9c
+EBUILD sonic-snap-1.7.ebuild 1789 RMD160 db44e6e0c1579cf6a6a30fd3ad667cad8d4e1b4e SHA1 4a155cb2f08b6d060f5eab13a845a1c7e6dd90ff SHA256 a835df1828195c8cb8c7b8504a3287b2f3ab04c5852546c9df4c0e3e2c4aba26
+MISC ChangeLog 1565 RMD160 cba656a544fc23a94e3d0f3ce0668085a32dd625 SHA1 0cc0009d4abb6b21b29a4bc7127924dfbab9277b SHA256 df7bcd5b62bf99782abbaca9bb6b5b76a8ee338bbabee78247f79d412dec7803
 MISC metadata.xml 383 RMD160 c1b1640a5ef93ddc12f9b114c33afc9f89f255fa SHA1 808256a499790b4ebd65d60da8689b00c4665f58 SHA256 7ab71437080a63d3ece843af99848253f76e45ca6bed9ca304cf5d3790059cad
diff --git a/media-video/sonic-snap/sonic-snap-1.5.ebuild b/media-video/sonic-snap/sonic-snap-1.7.ebuild
index 27bc6c6622d7..8a3965e167c4 100644
--- a/media-video/sonic-snap/sonic-snap-1.5.ebuild
+++ b/media-video/sonic-snap/sonic-snap-1.7.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/sonic-snap-1.5.ebuild,v 1.10 2009/09/23 14:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/sonic-snap-1.7.ebuild,v 1.1 2011/03/14 01:16:31 nerdboy Exp $
 
-EAPI="1"
-inherit eutils linux-info
+EAPI="3"
+inherit eutils linux-info toolchain-funcs
 
 DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
-HOMEPAGE="http://bram.creative4vision.nl/sonic-snap/"
-SRC_URI="http://bram.creative4vision.nl/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="http://www.stolk.org/sonic-snap/"
+SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mpeg"
 
 DEPEND="x11-libs/fltk:1.1
@@ -28,10 +28,17 @@ CONFIG_CHECK="~USB_SN9C102"
 ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \
 enabled, under V4L USB devices, as a module in your kernel."
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use mpeg && sed -i -e "s?USE_FAME=0?USE_FAME=1?g" Makefile
+src_prepare() {
+	# fix bad assumptions
+	sed -i \
+		-e "s|\$(HOME)/include|/usr/include|" \
+		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
+		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
+		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
+		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
+		Makefile
+
+	use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile
 }
 
 src_compile() {
@@ -41,7 +48,6 @@ src_compile() {
 src_install() {
 	dodir /usr/bin
 	make DESTDIR="${D}" install || die '"make install" failed.'
-	#einstall || die "einstall failed"
 
 	dodoc ChangeLog README
 	doman debian/sonic-snap.1
@@ -49,12 +55,12 @@ src_install() {
 
 pkg_postinst() {
 
-	ewarn
+	elog
 	elog "This driver is V4L v2 only, so V4L v1 apps will not work."
 	elog "Finally, only a few image sensors are supported, eg, PAS106B"
 	elog "so (check dmesg or /var/log/messages for USB device info when"
 	elog "you plug the cam in)."
 	elog
 	elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
-	ewarn
+	elog
 }