Add a patch by Daniel Pielmeier <daniel.pielmeier@googlemail.com> to fix build when /usr/local does not exist. Bug #230095

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/media-video/dvbcut/ChangeLog b/media-video/dvbcut/ChangeLog
index 2dd5f7c2ab35..5569139bee94 100644
--- a/media-video/dvbcut/ChangeLog
+++ b/media-video/dvbcut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvbcut
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.15 2008/10/14 16:27:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.16 2008/10/19 17:29:14 aballier Exp $
+
+  19 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/dvbcut-0.5.4-scons.patch, dvbcut-0.5.4-r1.ebuild:
+  Add a patch by Daniel Pielmeier <daniel.pielmeier@googlemail.com> to fix
+  build when /usr/local does not exist. Bug #230095
 
   14 Oct 2008; Alexis Ballier <aballier@gentoo.org> dvbcut-0.5.4-r1.ebuild:
   a52 useflag is no more in ffmpeg, add a --missing true option to
diff --git a/media-video/dvbcut/Manifest b/media-video/dvbcut/Manifest
index ffabf6ed1c80..54304d51e104 100644
--- a/media-video/dvbcut/Manifest
+++ b/media-video/dvbcut/Manifest
@@ -9,14 +9,15 @@ AUX dvbcut-0.5.4-ffmpeg-compat3.patch 6179 RMD160 4c6721d92fd508b56924975779acc0
 AUX dvbcut-0.5.4-gcc42.patch 576 RMD160 6e84fa4a525f4bba1f4f8263048b8dd89ddd2294 SHA1 adb11d4d8eb3b48c1c5a437fb70013c6e3b0e104 SHA256 9792d58872aa949233d3b554019cf63ba08c8ee4a2bd03ece55b69392f521a83
 AUX dvbcut-0.5.4-gcc43.patch 728 RMD160 60ddd508f1dc360294c69c29f00a73f441e002a8 SHA1 2786e584515aca073cd96091192c02b15b6065fc SHA256 59dcaeaec52c021cda26252f153a0b427b25763afb89dba3ac0ca9b114b2f7a2
 AUX dvbcut-0.5.4-lavc.patch 1826 RMD160 74c476d64fc4fa3b4334fdd5d08d7df8b40de71f SHA1 5f85feff3a0446e07fe2ea2e88200025a9755413 SHA256 86d1d0c4533cca0940e62b8018e807525df39fa4af483dcfb850651144cc74c6
+AUX dvbcut-0.5.4-scons.patch 611 RMD160 483b17b11abcd633cf142dc8ee55d5bf58af3bbe SHA1 f3444dd91285611502ac4471edf707c4c783fc34 SHA256 ef52402ebc6e9fb584954e8df2a1fe152ddabaa9d4f600d9aedd3a4b4b977b2b
 DIST dvbcut_0.5.4.tar.bz2 795991 RMD160 fc36b9d3abd818495498c1d8181e1250f43e0057 SHA1 2bf174ec05fd92a9ac5878498c91f90bd307a2ca SHA256 db6500fc327585be6ee5a36135c9940828d22bde936daa17b6a5cce852ad9f70
-EBUILD dvbcut-0.5.4-r1.ebuild 1739 RMD160 148f865aa9b287836626d7c06706c94a6920abcb SHA1 432702a5b2546e44f9ba1ea615123633f2cd4d94 SHA256 72393a990f97de2c69a7a54cf07b4f824b50a0a430aca81c967fe09bce061aab
-MISC ChangeLog 3135 RMD160 a018145e5f1e3c3fe3284393fdff26c0efd839f2 SHA1 848247708421b6e9aa8f0eb95aa726a01755e922 SHA256 3b17ad4aff3ce5146357ee48b3c2f8528bb49c3bf9d98373fb0472d252b87351
+EBUILD dvbcut-0.5.4-r1.ebuild 1778 RMD160 504fc448b1c4193db4745c9ee5a4945ca2912ed2 SHA1 7ab8848428a8f581f7c59486d2698f5aaa4a3cda SHA256 0ff7a79fbe0344c8f18a54f87bd6c125d625690944830d6f45d2752eb859794b
+MISC ChangeLog 3374 RMD160 96f33a98db38f3fbeb72645941f5618379ec22c2 SHA1 fe9f0de37bc809fd4bc803915274070f504e8f74 SHA256 c95a0929bede2656e5ca715879a579050657f8f322d309d34ac027e95b224cd6
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj0yIQACgkQvFcC4BYPU0onGwCgzr0MyfNLK/5iR4WpAiZs0Z7e
-nOgAnijCKHiDiEak4QBuwhsT8Zsoh+KI
-=Es3w
+iEYEARECAAYFAkj7bnMACgkQvFcC4BYPU0pojwCeKJgk35Wva/ZPUWGF5sWsTKG6
+DtAAn1U77KDLRiyy69Cg7XegsUJPUZDQ
+=1eGS
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild b/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
index a54606c3b455..6414403bb9d7 100644
--- a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
+++ b/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild,v 1.7 2008/10/14 16:27:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild,v 1.8 2008/10/19 17:29:14 aballier Exp $
 
 EAPI=1
 
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-ffmpeg-compat3.patch"
 	epatch "${FILESDIR}/${P}-avformat-api-changes.patch"
 	epatch "${FILESDIR}/${P}-lavc.patch"
+	epatch "${FILESDIR}/${P}-scons.patch"
 
 	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
 		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326.diff"
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch b/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch
new file mode 100644
index 000000000000..5a4f1768db90
--- /dev/null
+++ b/media-video/dvbcut/files/dvbcut-0.5.4-scons.patch
@@ -0,0 +1,14 @@
+--- SConstruct	2007-04-13 19:36:40.000000000 +0200
++++ SConstruct	2008-06-29 22:38:32.000000000 +0200
+@@ -7,9 +7,9 @@
+ 
+ opts=Options()
+ 
+-opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr/local'))
++opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr'))
+ opt=opts.Add(PathOption('BINDIR', 'Directory to install under', os.path.join('$PREFIX','bin')))
+-opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','man')))
++opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','share/man')))
+ 
+ ### DEBUG MODE
+