Do not create video-directory as this will have wrong permission if we create it - and not everyone wants it, init-script does mkdir if needed.

Package-Manager: portage-2.1.5_rc1

4 files changed, 25 insertions, 8 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 475bc12be1d3..4df85c575c24 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.104 2008/03/24 09:46:58 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.105 2008/04/05 15:23:30 zzam Exp $
+
+  05 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.7-r10.ebuild,
+  vdr-1.6.0.ebuild:
+  Do not create video-directory as this will have wrong permission if we
+  create it - and not everyone wants it, init-script does mkdir if needed.
 
 *vdr-1.6.0 (24 Mar 2008)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e6c7095e3a10..a1dfa0069dce 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6e2eba4cf SHA1 f773f63d7aebc59133e4accd36c87bf6feefb189 SHA256 e926ca80b87585d59698c05b48b0464e4e72913c4adfbb912541ebacf58d3d25
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
 AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6c312f3731cf5aed SHA1 f96b5d2444c5b11a3374274f37492b741d1213de SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df
@@ -11,7 +14,14 @@ DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SH
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3e9a9e72b56f9411 SHA1 68aed71209630ef69b0be0e16a927076b375f3fc SHA256 7889817f005f9640946b4909763e1598f54897152be36064d817fbcab94dac3f
 EBUILD vdr-1.4.6.ebuild 5652 RMD160 7ff1ac174567addba81e261c15d1b4d7b21559cb SHA1 ebbd9ddeac7ad9234c512fbebfc2cfb9e7959a2f SHA256 a6eb0ac715f391f2738d29ba9eb1c123939831747fba2ec7f33ef4799542ae98
-EBUILD vdr-1.4.7-r10.ebuild 9031 RMD160 d4d7216123e644b513318204df90898f0b44cf7d SHA1 2a958835a83f2786f63caab1d35dc632a12b1d2d SHA256 62c8068e6a11dd61d5ecf775403b0b4bc7aaa51ea5835a5a9fe26080ddb353e5
-EBUILD vdr-1.6.0.ebuild 9434 RMD160 cf684a15012a39284decae8f75285994ca630a52 SHA1 c30423bce3cf8404b3a23a5a3b43ad433cb3678f SHA256 31a950f011efe8c7cb8926eb2a09eba5c959a895c6e9307402658656bbc07e46
-MISC ChangeLog 17909 RMD160 39adefb579334f4611704c0878caeb89fae421c3 SHA1 9b410b2a2dfd2ffaf8aea8afc44e61ea4a8c0bf5 SHA256 686571db5cb62cdee095fa78a5aeda490010e7b667d955d547a78d68fff1703a
+EBUILD vdr-1.4.7-r10.ebuild 9129 RMD160 27c21054ebbca77d0cfbadbc2d8d76bed34f894c SHA1 61b82223bbeb594a1f06bde8ea285ac94d797837 SHA256 5fa7aa31af9f80b3c01f9cadb76e5009008d6b97ccdc11d254861bd0f8681d45
+EBUILD vdr-1.6.0.ebuild 9472 RMD160 f10698fd725efbf152b4363980b0a964d0e2d5e0 SHA1 da744f54fe09051a66155b9e2bb2ee65d4f3a6c0 SHA256 0ec1166d80edf15618849db2e28cb211950c29b7fb98b7166691c76b39c9c36f
+MISC ChangeLog 18148 RMD160 36446d1f60c39693c72e1e528b208b80d9b5c1a5 SHA1 c6cb90826bb2b3cd7b9fe03dac0b5a8d78588ce6 SHA256 bd0973a4c4d7df744b6c9f487aeb9d2b89a84a7ae585f8bf01e05b74c2543bb6
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf3mXwACgkQt2vP6XvVdOeyQgCgjq2Z/BerhB+i7R+7q1yppEHU
+qhMAoNLG4mUq2KWOtVsr9v8tp4obvI0V
+=rvkO
+-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 7a50e8690eac..5c6777a60b42 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.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/vdr/vdr-1.4.7-r10.ebuild,v 1.3 2008/02/10 21:18:08 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.4 2008/04/05 15:23:30 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -289,7 +289,9 @@ src_unpack() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
 
 	keepdir "${CONF_DIR}"/plugins
 	keepdir "${CONF_DIR}"/themes
diff --git a/media-video/vdr/vdr-1.6.0.ebuild b/media-video/vdr/vdr-1.6.0.ebuild
index 10c57b62a131..be47686f49ca 100644
--- a/media-video/vdr/vdr-1.6.0.ebuild
+++ b/media-video/vdr/vdr-1.6.0.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/vdr/vdr-1.6.0.ebuild,v 1.2 2008/03/24 15:25:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.3 2008/04/05 15:23:30 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -296,7 +296,7 @@ src_unpack() {
 src_install() {
 	# trick makefile not to create a videodir by supplying it with an existing
 	# directory
-	emake install DESTDIR="${D}"
+	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
 
 	keepdir "${CONF_DIR}"/plugins
 	keepdir "${CONF_DIR}"/themes