summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2012-06-22 15:53:37 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2012-06-22 15:53:37 +0000
commite80a29af0c614ebc67248a883407b10cb1f0d6a5 (patch)
tree6e93606a862b0b6c860eca10c4a49c7371b0f40b /media-video/vdr
parentMarking Cache-Memcached-1.290.0 ppc64 for bug 421613 (diff)
downloadhistorical-e80a29af0c614ebc67248a883407b10cb1f0d6a5.tar.gz
historical-e80a29af0c614ebc67248a883407b10cb1f0d6a5.tar.bz2
historical-e80a29af0c614ebc67248a883407b10cb1f0d6a5.zip
fixed linguas patch, failed install, reported by flameeyes@g.o
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/ChangeLog6
-rw-r--r--media-video/vdr/Manifest12
-rw-r--r--media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff (renamed from media-video/vdr/files/vdr-1.6.0_p2_linguas-v2.diff)9
-rw-r--r--media-video/vdr/vdr-1.6.0_p2-r10.ebuild4
4 files changed, 22 insertions, 9 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d8225d7575de..84602ffd7061 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vdr
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.164 2012/06/19 18:40:07 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.165 2012/06/22 15:53:36 hd_brummy Exp $
+
+ 22 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r10.ebuild,
+ -files/vdr-1.6.0_p2_linguas-v2.diff, +files/vdr-1.6.0_p2_linguas-v3.diff:
+ fixed linguas patch, failed install, reported by flameeyes@g.o
19 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r10.ebuild:
added missing inherit toolchain-funcs; stable x86 amd64
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e0e520598785..fa42a783a9c6 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -9,21 +9,21 @@ AUX vdr-1.6.0-shared-tinyxml.diff 1215 RMD160 ee1133b6dcdaa1600c38ef0bbebb4a49b5
AUX vdr-1.6.0-use-v4l2.patch 7994 RMD160 a83561181024f202d6be2f42b5f1a6027d262107 SHA1 437bc0b62b2f78743411a41b9db8020b2bbf3632 SHA256 c4f5ec527c1ac8fa82a2a780251e040471a7056f1a784d817a9e8fc56280a852
AUX vdr-1.6.0_p2_fontconfig_fontsort.patch 566 RMD160 e792452e8deb477a407dc4e4927a2593c5fa4c64 SHA1 4be3450b824a6c0f71101259a21d9a70b666f18b SHA256 fdf75ca1f2f041eacb19974b27dfb21eece202ddde0a54a5041a85d1fa3a3f47
AUX vdr-1.6.0_p2_gcc-4.7.patch 603 RMD160 0e3db1dc0e33ff61881f408e181f323a2a07c8a1 SHA1 edaf21baa6a93eaa2c79c4d16f3781b99b269736 SHA256 d7fe0d360d96dcd2636cfc7e6a3d1aff9e97522ace1f068e2b75685284ed111c
-AUX vdr-1.6.0_p2_linguas-v2.diff 621 RMD160 db58bf5872201788aa333fde868888b8b4f266b0 SHA1 c85229190cf01314610c52b681cfcada5f8a4512 SHA256 d6ab8d64ed1f10930b538b3cb0e56548f57f13f04f18512fb5b0e447158b17e5
+AUX vdr-1.6.0_p2_linguas-v3.diff 937 RMD160 068cd9a250b4bf77a82c9e822b0b02faa50d30c7 SHA1 daf25960001d0887097f0d41688b2ff0ecab70c6 SHA256 d07252828f226bd8e63c7958629c4fe69102c32ffd884461dd803625b936a4fe
AUX vdr-dvb-api-5-is-fine.diff 392 RMD160 599009b4adedd9ef010b899b96744b29fa407ed7 SHA1 cf99f962034a5f7e5ba1cf06557e01e7d56bd281 SHA256 ba126c8233bae50f514aa713072027968d9e115e0d154e2e1d31fe1b8cbbb403
DIST VDR-Extensions-Patch-72.tar.bz2 445171 RMD160 7a7e3b37810878138af50b6debf6bb14ad746327 SHA1 32075286c7d53060183a931f5ac52fbdb5cdff36 SHA256 defad883a4f42ebc257c14e1a71ec559db2d4d1d2d37eeee04abca542efbcf8d
DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1 68a4a9aab1e5179b5d9725481e09bc1213d1aff2 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb
DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
-EBUILD vdr-1.6.0_p2-r10.ebuild 11933 RMD160 3498cc208fa38d297d010da199a164b9200a84a3 SHA1 05b6c2ffa0c8007c493ba01e7682aad36b3a25e2 SHA256 5d46583f222e5060f1c522c8d1ff21b76f8f12d92b21f922b212abd357aa098e
+EBUILD vdr-1.6.0_p2-r10.ebuild 11933 RMD160 00cd08cf4408f8a4b9347a84c351f5895bec71cc SHA1 1b524d104d05f1c9da682158dd50a5a323b784da SHA256 f313dc8367ef56e529394134325d3ce1eecb1c52d9fec51b0a341ab755b55516
EBUILD vdr-1.6.0_p2-r7.ebuild 11487 RMD160 c59fd46d2510d1892b68230c03cf24a24586fd7f SHA1 89e467abbce351f642475a234b223e0eb80a883f SHA256 32a60a57b47d1b1c7a545d4c793182edc0ab9a0e3ed6bc2dcacd279da8b30d22
-MISC ChangeLog 29685 RMD160 8cce3aeebc79aa710e74808330057c676d33c3da SHA1 6e6573d5f707f2459d6291408ff1197910a0d051 SHA256 26356f8d557119ae6730773ce28cbca06cec83b771772e1076ec1e57ce38c2d1
+MISC ChangeLog 29907 RMD160 95329cb72dd0d475750bc406f5e570a338f126b8 SHA1 718e90c70f1b23e35dc098e950deedfdde5c99ed SHA256 ace1b324196eacfe76b848e112d4234f33574ecbe53ef28e1008621795cb1bd8
MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFP4Meedn07HTTCgIoRAhwvAJ4qq51XUDzisnLrDAbYhPTsyKaucQCbBOeB
-TAKHNVJllKjQ7QEnFy7982Y=
-=QCbc
+iD8DBQFP5JULdn07HTTCgIoRAoCiAJ9IQcazAfCqvs4UAmQBGBgqcYLERgCfbBuh
+NMseLIqNvyToibPBaQgeQGs=
+=pSOO
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v2.diff b/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
index 8f38e46817ed..0b9eb5d668d6 100644
--- a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v2.diff
+++ b/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
@@ -13,3 +13,12 @@ diff -Naur vdr-1.7.27.orig/Makefile vdr-1.7.27/Makefile
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/vdr.pot
+@@ -167,7 +167,7 @@
+
+ install-i18n:
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- @(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
diff --git a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild b/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
index 4b3f4106d1fe..2808e5fd90a5 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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_p2-r10.ebuild,v 1.4 2012/06/19 18:40:07 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r10.ebuild,v 1.5 2012/06/22 15:53:36 hd_brummy Exp $
EAPI="4"
@@ -243,7 +243,7 @@ src_prepare() {
epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
- epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas-v2.diff
+ epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas-v3.diff
epatch "${FILESDIR}"/vdr-1.6.0_p2_fontconfig_fontsort.patch
epatch "${FILESDIR}"/vdr-1.6.0_p2_gcc-4.7.patch